tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix queued deletion check (singulo loosing at beyond PA 1 but only on live servers) (#28906)

Browse Source 
Fix queued deletion check
This commit is contained in:
Partmedia
2024-06-12 14:56:07 -08:00
committed by GitHub
parent b091a55d7d
commit 35e5a96b7e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs
View File

@@ -116,10 +116,12 @@ public sealed class EventHorizonSystem : SharedEventHorizonSystem
/// </summary> /// </summary>
public void ConsumeEntity(EntityUid hungry, EntityUid morsel, EventHorizonComponent eventHorizon, BaseContainer? outerContainer = null) 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? if (EntityManager.IsQueuedForDeletion(morsel)) // already handled, and we're substepping
&& (HasComp<MindContainerComponent>(morsel) return;
if (HasComp<MindContainerComponent>(morsel)
|| _tagSystem.HasTag(morsel, "HighRiskItem") || _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"); _adminLogger.Add(LogType.EntityDelete, LogImpact.Extreme, $"{ToPrettyString(morsel)} entered the event horizon of {ToPrettyString(hungry)} and was deleted");
} }