From d7e489f2b851529444f6056927a117e2e86a34a0 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Sat, 19 Dec 2020 17:11:08 +0100
Subject: [PATCH] Fix EntityTest SpawnTest

---
 Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs b/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs
index d5a17bf19c..5a7e6bb994 100644
--- a/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs
+++ b/Content.Server/GameObjects/EntitySystems/AI/AiSystem.cs
@@ -70,7 +70,8 @@ namespace Content.Server.GameObjects.EntitySystems.AI
 
             foreach (var message in _queuedMobStateMessages)
             {
-                if (!message.Entity.TryGetComponent(out AiControllerComponent? controller))
+                if (message.Entity.Deleted ||
+                    !message.Entity.TryGetComponent(out AiControllerComponent? controller))
                 {
                     continue;
                 }