From 6240f43ea52830d1fde9c692898a52a4bb420e4b Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Wed, 26 Aug 2020 00:16:54 +1000
Subject: [PATCH] Fix AI mapping crash (#1915)

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
---
 .../GameObjects/EntitySystems/AI/AiSystem.cs         | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs
index e8470bff1e..2901b72457 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs
@@ -68,11 +68,23 @@ namespace Content.Server.GameObjects.EntitySystems.AI
             }
 
             _queuedSleepMessages.Clear();
+            var toRemove = new List<AiLogicProcessor>();
 
             foreach (var processor in _awakeAi)
             {
+                if (processor.SelfEntity.Deleted)
+                {
+                    toRemove.Add(processor);
+                    continue;
+                }
+                
                 processor.Update(frameTime);
             }
+
+            foreach (var processor in toRemove)
+            {
+                _awakeAi.Remove(processor);
+            }
         }
 
         private void HandleAiSleep(SleepAiMessage message)