From c4dd912106a87334675bd4da83e1bdc191a9b946 Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sun, 4 May 2025 01:47:11 -0400 Subject: [PATCH] Don't despawn off-grid salv mob corpses (#37169) --- Content.Server/Salvage/SalvageSystem.Magnet.cs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Content.Server/Salvage/SalvageSystem.Magnet.cs b/Content.Server/Salvage/SalvageSystem.Magnet.cs index 694186da9a..41d4c2e755 100644 --- a/Content.Server/Salvage/SalvageSystem.Magnet.cs +++ b/Content.Server/Salvage/SalvageSystem.Magnet.cs @@ -135,11 +135,11 @@ public sealed partial class SalvageSystem if (data.Comp.ActiveEntities != null) { // Handle mobrestrictions getting deleted - var query = AllEntityQuery(); + var query = AllEntityQuery(); - while (query.MoveNext(out var salvUid, out var salvMob)) + while (query.MoveNext(out var salvUid, out var salvMob, out var salvMobState)) { - if (data.Comp.ActiveEntities.Contains(salvMob.LinkedEntity)) + if (data.Comp.ActiveEntities.Contains(salvMob.LinkedEntity) && _mobState.IsAlive(salvUid, salvMobState)) { QueueDel(salvUid); } @@ -164,8 +164,7 @@ public sealed partial class SalvageSystem uid = _transform.GetParentUid(uid); if (_mobStateQuery.HasComp(uid)) return true; - } - while (uid != xform.GridUid && uid != EntityUid.Invalid); + } while (uid != xform.GridUid && uid != EntityUid.Invalid); return false; } -- 2.51.2