From dfbd88507a54ce3a7f3a1e30857ba5007ccf1e01 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Sat, 5 Aug 2023 04:37:16 +1000 Subject: [PATCH] Fix spear wielding (#18658) Bottom text --- Content.Shared/Projectiles/SharedProjectileSystem.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Content.Shared/Projectiles/SharedProjectileSystem.cs b/Content.Shared/Projectiles/SharedProjectileSystem.cs index 15a4a52ae5..c6629c5e7c 100644 --- a/Content.Shared/Projectiles/SharedProjectileSystem.cs +++ b/Content.Shared/Projectiles/SharedProjectileSystem.cs @@ -40,6 +40,11 @@ namespace Content.Shared.Projectiles if (component.RemovalTime == null) return; + if (args.Handled || !TryComp(uid, out var physics) || physics.BodyType != BodyType.Static) + return; + + args.Handled = true; + _doAfter.TryStartDoAfter(new DoAfterArgs(args.User, component.RemovalTime.Value, new RemoveEmbeddedProjectileEvent(), eventTarget: uid, target: uid) {