Bunch of fixes to null reference exceptions caused by removing characters mid-round

2017-06-21 16:56:35 +03:00
parent 4ac9aa09c6
commit 38f92acf8e
4 changed files with 28 additions and 8 deletions
@@ -109,6 +109,7 @@ namespace Barotrauma
        public void AddToRemoveQueue(Entity entity)
        {
            if (GameMain.Client != null) return;
+            if (removeQueue.Contains(entity) || entity.Removed) return;

            removeQueue.Enqueue(entity);
        }
@@ -116,6 +117,7 @@ namespace Barotrauma
        public void AddToRemoveQueue(Item item)
        {
            if (GameMain.Client != null) return;
+            if (removeQueue.Contains(item) || item.Removed) return;

            removeQueue.Enqueue(item);
            if (item.ContainedItems == null) return;