Add user to AttemptMeleeEvent, add ThrowItemAttemptEvent (#30193)

* Add user to AttemptMeleeEvent, add ThrowItemAttemptEvent * Add xmldoc
2024-07-20 01:06:52 -07:00
parent 1208928564
commit 297baaca23
3 changed files with 16 additions and 2 deletions
--- a/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
+++ b/Content.Shared/ActionBlocker/ActionBlockerSystem.cs
@@ -120,7 +120,13 @@ namespace Content.Shared.ActionBlocker
            var ev = new ThrowAttemptEvent(user, itemUid);
            RaiseLocalEvent(user, ev);

-            return !ev.Cancelled;
+            if (ev.Cancelled)
+                return false;
+
+            var itemEv = new ThrowItemAttemptEvent(user);
+            RaiseLocalEvent(itemUid, ref itemEv);
+
+            return !itemEv.Cancelled;
        }

        public bool CanSpeak(EntityUid uid)