Fixed exceptions when adding entities to EntitySpawner remove queue in single player mode
This commit is contained in:
@@ -111,11 +111,13 @@ namespace Barotrauma
|
|||||||
if (entity is Character)
|
if (entity is Character)
|
||||||
{
|
{
|
||||||
Character character = entity as Character;
|
Character character = entity as Character;
|
||||||
Client client = GameMain.Server.ConnectedClients.Find(c => c.Character == character);
|
if (GameMain.Server != null)
|
||||||
if (client != null) GameMain.Server.SetClientCharacter(client, null);
|
{
|
||||||
|
Client client = GameMain.Server.ConnectedClients.Find(c => c.Character == character);
|
||||||
|
if (client != null) GameMain.Server.SetClientCharacter(client, null);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
removeQueue.Enqueue(entity);
|
removeQueue.Enqueue(entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -144,7 +146,7 @@ namespace Barotrauma
|
|||||||
{
|
{
|
||||||
if (GameMain.Client != null) return;
|
if (GameMain.Client != null) return;
|
||||||
|
|
||||||
while (spawnQueue.Count>0)
|
while (spawnQueue.Count > 0)
|
||||||
{
|
{
|
||||||
var entitySpawnInfo = spawnQueue.Dequeue();
|
var entitySpawnInfo = spawnQueue.Dequeue();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user