Merge branch 'ai-overhaul'

Conflicts: Barotrauma/Source/Characters/Attack.cs
2017-06-29 17:02:37 +03:00
parent d6228500f4 450020b47c
commit 84e3c062a6
46 changed files with 1148 additions and 488 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;