From: Moony <moony@hellomouse.net>
Date: Sun, 5 Mar 2023 00:31:25 +0000 (-0600)
Subject: Update GameTicker.RoundFlow.cs (#14387)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=b872255e829365d136797d813f6b10a13aaa9117;p=space-station-14.git

Update GameTicker.RoundFlow.cs (#14387)

* Update GameTicker.RoundFlow.cs

* wtf
---

diff --git a/Content.Server/GameTicking/GameTicker.RoundFlow.cs b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
index ab9c7ea4bf..2e4121e505 100644
--- a/Content.Server/GameTicking/GameTicker.RoundFlow.cs
+++ b/Content.Server/GameTicking/GameTicker.RoundFlow.cs
@@ -424,7 +424,8 @@ namespace Content.Server.GameTicking
 #endif
                 // TODO: Maybe something less naive here?
                 // FIXME: Actually, definitely.
-                EntityManager.DeleteEntity(entity);
+                if (!Deleted(entity) && !Terminating(entity))
+                    EntityManager.DeleteEntity(entity);
 #if EXCEPTION_TOLERANCE
                 }
                 catch (Exception e)