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.Server/Weapons/Melee/MeleeWeaponSystem.cs
+++ b/Content.Server/Weapons/Melee/MeleeWeaponSystem.cs
@@ -121,7 +121,7 @@ public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
        {
            return;
        }
-        
+
        if (!_interaction.InRangeUnobstructed(user, ev.Target.Value, component.Range))
            return;

@@ -308,8 +308,11 @@ public sealed class MeleeWeaponSystem : SharedMeleeWeaponSystem
        if (!base.DoDisarm(user, ev, component))
            return false;

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

        var target = ev.Target!.Value;