Fixed exceptions when adding entities to EntitySpawner remove queue in single player mode

This commit is contained in:
Joonas Rikkonen
2017-12-06 02:39:58 +02:00
parent 2e6d35ce8e
commit cccdd20401

View File

@@ -111,10 +111,12 @@ namespace Barotrauma
if (entity is Character)
{
Character character = entity as Character;
Client client = GameMain.Server.ConnectedClients.Find(c => c.Character == character);
if (client != null) GameMain.Server.SetClientCharacter(client, null);
}
if (GameMain.Server != null)
{
Client client = GameMain.Server.ConnectedClients.Find(c => c.Character == character);
if (client != null) GameMain.Server.SetClientCharacter(client, null);
}
}
removeQueue.Enqueue(entity);
}
@@ -143,8 +145,8 @@ namespace Barotrauma
public void Update()
{
if (GameMain.Client != null) return;
while (spawnQueue.Count>0)
while (spawnQueue.Count > 0)
{
var entitySpawnInfo = spawnQueue.Dequeue();