Make CanAttack check for container (#11650)

2022-10-04 12:50:09 +11:00
parent b754b87985
commit fb839f865e
2 changed files with 9 additions and 3 deletions
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -229,14 +229,14 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
        if (weapon.NextAttack > curTime)
            return;

+        if (!CombatMode.IsInCombatMode(user))
+            return;
+
        if (!Blocker.CanAttack(user))
            return;

        // Windup time checked elsewhere.

-        if (!CombatMode.IsInCombatMode(user))
-            return;
-
        if (weapon.NextAttack < curTime)
            weapon.NextAttack = curTime;