From 35e5a96b7ebb73c67b3fade4d6ed731028dfc551 Mon Sep 17 00:00:00 2001
From: Partmedia <kevinz5000@gmail.com>
Date: Wed, 12 Jun 2024 14:56:07 -0800
Subject: [PATCH] Fix queued deletion check (singulo loosing at beyond PA 1 but
 only on live servers) (#28906)

Fix queued deletion check
---
 .../Singularity/EntitySystems/EventHorizonSystem.cs       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
index d7b83d4439915b..e6c627f353e2bb 100644
--- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
+++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
@@ -116,10 +116,12 @@ public void Update(EntityUid uid, EventHorizonComponent? eventHorizon = null, Tr
     /// </summary>
     public void ConsumeEntity(EntityUid hungry, EntityUid morsel, EventHorizonComponent eventHorizon, BaseContainer? outerContainer = null)
     {
-        if (!EntityManager.IsQueuedForDeletion(morsel) // I saw it log twice a few times for some reason?
-        && (HasComp<MindContainerComponent>(morsel)
+        if (EntityManager.IsQueuedForDeletion(morsel)) // already handled, and we're substepping
+            return;
+
+        if (HasComp<MindContainerComponent>(morsel)
             || _tagSystem.HasTag(morsel, "HighRiskItem")
-            || HasComp<ContainmentFieldGeneratorComponent>(morsel)))
+            || HasComp<ContainmentFieldGeneratorComponent>(morsel))
         {
             _adminLogger.Add(LogType.EntityDelete, LogImpact.Extreme, $"{ToPrettyString(morsel)} entered the event horizon of {ToPrettyString(hungry)} and was deleted");
         }