From ebe79def5885b26bb61217fd4fb0faf1922a2c14 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Fri, 21 Oct 2022 01:09:52 +1100
Subject: [PATCH] Fix admin freeze attacks (#12072)

---
 Content.Shared/Administration/AdminFrozenSystem.cs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Content.Shared/Administration/AdminFrozenSystem.cs b/Content.Shared/Administration/AdminFrozenSystem.cs
index 184b81affa..4e2049b85d 100644
--- a/Content.Shared/Administration/AdminFrozenSystem.cs
+++ b/Content.Shared/Administration/AdminFrozenSystem.cs
@@ -20,14 +20,20 @@ public sealed class AdminFrozenSystem : EntitySystem
     {
         base.Initialize();
 
-        SubscribeLocalEvent<AdminFrozenComponent, UseAttemptEvent>((_, _, args) => args.Cancel());
-        SubscribeLocalEvent<AdminFrozenComponent, PickupAttemptEvent>((_, _, args) => args.Cancel());
-        SubscribeLocalEvent<AdminFrozenComponent, ThrowAttemptEvent>((_, _, args) => args.Cancel());
-        SubscribeLocalEvent<AdminFrozenComponent, InteractionAttemptEvent>((_, _, args) => args.Cancel());
+        SubscribeLocalEvent<AdminFrozenComponent, UseAttemptEvent>(OnAttempt);
+        SubscribeLocalEvent<AdminFrozenComponent, PickupAttemptEvent>(OnAttempt);
+        SubscribeLocalEvent<AdminFrozenComponent, ThrowAttemptEvent>(OnAttempt);
+        SubscribeLocalEvent<AdminFrozenComponent, InteractionAttemptEvent>(OnAttempt);
         SubscribeLocalEvent<AdminFrozenComponent, ComponentStartup>(OnStartup);
         SubscribeLocalEvent<AdminFrozenComponent, ComponentShutdown>(UpdateCanMove);
         SubscribeLocalEvent<AdminFrozenComponent, UpdateCanMoveEvent>(OnUpdateCanMove);
         SubscribeLocalEvent<AdminFrozenComponent, PullAttemptEvent>(OnPullAttempt);
+        SubscribeLocalEvent<AdminFrozenComponent, AttackAttemptEvent>(OnAttempt);
+    }
+
+    private void OnAttempt(EntityUid uid, AdminFrozenComponent component, CancellableEntityEventArgs args)
+    {
+        args.Cancel();
     }
 
     private void OnPullAttempt(EntityUid uid, AdminFrozenComponent component, PullAttemptEvent args)