Prevent subfloor melee attacks (#12899)

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2022-12-17 14:47:15 +11:00
parent 127d0e93da
commit 8bc5f29f9f
4 changed files with 40 additions and 3 deletions
--- a/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
+++ b/Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
@@ -295,8 +295,21 @@ public abstract class SharedMeleeWeaponSystem : EntitySystem
        if (!CombatMode.IsInCombatMode(user))
            return;

-        if (!Blocker.CanAttack(user))
-            return;
+        switch (attack)
+        {
+            case LightAttackEvent light:
+                if (!Blocker.CanAttack(user, light.Target))
+                    return;
+                break;
+            case DisarmAttackEvent disarm:
+                if (!Blocker.CanAttack(user, disarm.Target))
+                    return;
+                break;
+            default:
+                if (!Blocker.CanAttack(user))
+                    return;
+                break;
+        }

        // Windup time checked elsewhere.