From 4f8ee409665728606b35862a3cc2a9dee396e7ed Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Fri, 3 Jun 2022 22:59:07 -0400 Subject: [PATCH] Don't cancel pulling a corpse because the player ghosted (#8621) * Check if pullable is dead * Update SharedPullableSystem.cs Co-authored-by: wrexbe <81056464+wrexbe@users.noreply.github.com> --- Content.Shared/Pulling/Systems/SharedPullableSystem.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Content.Shared/Pulling/Systems/SharedPullableSystem.cs b/Content.Shared/Pulling/Systems/SharedPullableSystem.cs index 29610afb5b..846b12486a 100644 --- a/Content.Shared/Pulling/Systems/SharedPullableSystem.cs +++ b/Content.Shared/Pulling/Systems/SharedPullableSystem.cs @@ -1,6 +1,7 @@ using Content.Shared.ActionBlocker; using Content.Shared.Movement.EntitySystems; using Content.Shared.Pulling.Components; +using Content.Shared.MobState.Components; namespace Content.Shared.Pulling.Systems { @@ -19,6 +20,7 @@ namespace Content.Shared.Pulling.Systems { var entity = args.Session.AttachedEntity; if (entity == null || !_blocker.CanMove(entity.Value)) return; + if (TryComp(component.Owner, out var mobState) && mobState.IsIncapacitated()) return; _pullSystem.TryStopPull(component); } }