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

Fix gibbing related test warnings (#15466)

Browse Source
This commit is contained in:
Leon Friedrich
2023-04-17 14:12:15 +12:00
committed by GitHub
parent e7b52b4475
commit fc347e6f1b
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Body/Systems/BodySystem.cs
View File

@@ -18,6 +18,7 @@ using Robust.Shared.Audio;
using Robust.Shared.Containers; using Robust.Shared.Containers;
using Robust.Shared.Player; using Robust.Shared.Player;
using Robust.Shared.Timing; using Robust.Shared.Timing;
using Robust.Shared.Utility;
namespace Content.Server.Body.Systems; namespace Content.Server.Body.Systems;
@@ -138,9 +139,15 @@ public sealed class BodySystem : SharedBodySystem
if (bodyId == null || !Resolve(bodyId.Value, ref body, false)) if (bodyId == null || !Resolve(bodyId.Value, ref body, false))
return new HashSet<EntityUid>(); return new HashSet<EntityUid>();
var gibs = base.GibBody(bodyId, gibOrgans, body, deleteItems); if (LifeStage(bodyId.Value) >= EntityLifeStage.Terminating || EntityManager.IsQueuedForDeletion(bodyId.Value))
return new HashSet<EntityUid>();
var xform = Transform(bodyId.Value); var xform = Transform(bodyId.Value);
if (xform.MapUid == null)
return new HashSet<EntityUid>();
var gibs = base.GibBody(bodyId, gibOrgans, body, deleteItems);
var coordinates = xform.Coordinates; var coordinates = xform.Coordinates;
var filter = Filter.Pvs(bodyId.Value, entityManager: EntityManager); var filter = Filter.Pvs(bodyId.Value, entityManager: EntityManager);
var audio = AudioParams.Default.WithVariation(0.025f); var audio = AudioParams.Default.WithVariation(0.025f);