]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix pacified players attacking with mechs (#34954)
authorthemias <89101928+themias@users.noreply.github.com>
Mon, 10 Feb 2025 22:17:57 +0000 (17:17 -0500)
committerGitHub <noreply@github.com>
Mon, 10 Feb 2025 22:17:57 +0000 (17:17 -0500)
Content.Shared/ActionBlocker/ActionBlockerSystem.cs

index 8a4b5baffd34d2c1d421b5b7c2ddd09a49296391..6152699ccb1c4f9987ee89d8c566da402d3ee01b 100644 (file)
@@ -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);