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/ActionBlocker/ActionBlockerSystem.cs
+++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
@@ -156,7 +156,17 @@ namespace Content.Shared.ActionBlocker
            var ev = new AttackAttemptEvent(uid, target);
            RaiseLocalEvent(uid, ev);

-            return !ev.Cancelled;
+            if (ev.Cancelled)
+                return false;
+
+            if (target != null)
+            {
+                var tev = new GettingAttackedAttemptEvent();
+                RaiseLocalEvent(target.Value, ref tev);
+                return !tev.Cancelled;
+            }
+
+            return true;
        }

        public bool CanChangeDirection(EntityUid uid)