vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-12-06 02:39:58 +02:00
parent 2e6d35ce8e
commit cccdd20401
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Networking/EntitySpawner.cs
+8 -6
View File
@@ -111,10 +111,12 @@ 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);
} }
@@ -143,8 +145,8 @@ namespace Barotrauma
public void Update() public void Update()
{ {
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();