cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't despawn off-grid salv mob corpses (#37169)

This commit is contained in:
Nemanja 2025-05-04 01:47:11 -04:00 committed by deltanedas
parent 2c14a00381
commit fb18b72bb8
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Salvage/SalvageSystem.Magnet.cs
View File

@ -136,11 +136,11 @@ public sealed partial class SalvageSystem
if (data.Comp.ActiveEntities != null)
{
// Handle mobrestrictions getting deleted
var query = AllEntityQuery<SalvageMobRestrictionsComponent>();
var query = AllEntityQuery<SalvageMobRestrictionsComponent, MobStateComponent>();
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);
}
@ -165,8 +165,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;
}