Skip to content

Commit

Permalink
Fix queued deletion check (singulo loosing at beyond PA 1 but only on…
Browse files Browse the repository at this point in the history
… live servers) (#28906)

Fix queued deletion check
  • Loading branch information
Partmedia authored Jun 12, 2024
1 parent b091a55 commit 35e5a96
Showing 1 changed file with 5 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
Expand Down

0 comments on commit 35e5a96

Please sign in to comment.