From b872255e829365d136797d813f6b10a13aaa9117 Mon Sep 17 00:00:00 2001 From: Moony Date: Sat, 4 Mar 2023 18:31:25 -0600 Subject: [PATCH] Update GameTicker.RoundFlow.cs (#14387) * Update GameTicker.RoundFlow.cs * wtf --- Content.Server/GameTicking/GameTicker.RoundFlow.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) -- 2.52.0