]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Update GameTicker.RoundFlow.cs (#14387)
authorMoony <moony@hellomouse.net>
Sun, 5 Mar 2023 00:31:25 +0000 (18:31 -0600)
committerGitHub <noreply@github.com>
Sun, 5 Mar 2023 00:31:25 +0000 (18:31 -0600)
* Update GameTicker.RoundFlow.cs

* wtf

Content.Server/GameTicking/GameTicker.RoundFlow.cs

index ab9c7ea4bf0a27033cf2f149317ba432607991fe..2e4121e505e47e7121e8082f9b730edb4b027b26 100644 (file)
@@ -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)