From 36bf5543523fbd7c805fc296f2619e9a7a17f849 Mon Sep 17 00:00:00 2001 From: themias <89101928+themias@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:17:57 -0500 Subject: [PATCH] Fix pacified players attacking with mechs (#34954) --- Content.Shared/ActionBlocker/ActionBlockerSystem.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs index 8a4b5baffd..6152699ccb 100644 --- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs +++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs @@ -199,7 +199,8 @@ namespace Content.Shared.ActionBlocker { var containerEv = new CanAttackFromContainerEvent(uid, target); RaiseLocalEvent(uid, containerEv); - return containerEv.CanAttack; + if (!containerEv.CanAttack) + return false; } var ev = new AttackAttemptEvent(uid, target, weapon, disarm); -- 2.51.2