Fix CanDisarm (#11843)

2022-10-15 15:14:07 +11:00
parent 635057fb7a
commit a93d6eb5b6
5 changed files with 16 additions and 10 deletions
--- a/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Client/Weapons/Melee/MeleeWeaponSystem.cs
@@ -202,8 +202,11 @@ public sealed partial class MeleeWeaponSystem : SharedMeleeWeaponSystem
        if (!base.DoDisarm(user, ev, component))
            return false;

-        if (!HasComp<CombatModeComponent>(user))
+        if (!TryComp<CombatModeComponent>(user, out var combatMode) ||
+            combatMode.CanDisarm != true)
+        {
            return false;
+        }

        // If target doesn't have hands then we can't disarm so will let the player know it's pointless.
        if (!HasComp<HandsComponent>(ev.Target!.Value))