From 3d003fdd02be1ccac2900a1f69c9d0778e731291 Mon Sep 17 00:00:00 2001
From: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
Date: Thu, 8 Dec 2022 19:17:56 -0600
Subject: [PATCH] Fix and reclassify existing anchor logs (#12926)

---
 .../Construction/AnchorableSystem.cs          | 30 ++++++++++++++-----
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/Content.Server/Construction/AnchorableSystem.cs b/Content.Server/Construction/AnchorableSystem.cs
index 0995242728..46822b1d70 100644
--- a/Content.Server/Construction/AnchorableSystem.cs
+++ b/Content.Server/Construction/AnchorableSystem.cs
@@ -58,7 +58,7 @@ namespace Content.Server.Construction
             _popup.PopupEntity(Loc.GetString("anchorable-unanchored"), uid, Filter.Pvs(uid, entityManager: EntityManager));
 
             _adminLogger.Add(
-                LogType.Action,
+                LogType.Unanchor,
                 LogImpact.Low,
                 $"{EntityManager.ToPrettyString(args.User):user} unanchored {EntityManager.ToPrettyString(uid):anchored} using {EntityManager.ToPrettyString(args.Using):using}"
             );
@@ -100,7 +100,7 @@ namespace Content.Server.Construction
             _popup.PopupEntity(Loc.GetString("anchorable-anchored"), uid, Filter.Pvs(uid, entityManager: EntityManager));
 
             _adminLogger.Add(
-                LogType.Action,
+                LogType.Anchor,
                 LogImpact.Low,
                 $"{EntityManager.ToPrettyString(args.User):user} anchored {EntityManager.ToPrettyString(uid):anchored} using {EntityManager.ToPrettyString(args.Using):using}"
             );
@@ -196,7 +196,7 @@ namespace Content.Server.Construction
             anchorable.CancelToken = new CancellationTokenSource();
 
             _tool.UseTool(usingUid, userUid, uid, 0f, anchorable.Delay, usingTool.Qualities,
-                new TryAnchorCompletedEvent(), new TryAnchorCancelledEvent(), uid, cancelToken: anchorable.CancelToken.Token);
+                new TryAnchorCompletedEvent(userUid, usingUid), new TryAnchorCancelledEvent(userUid, usingUid), uid, cancelToken: anchorable.CancelToken.Token);
         }
 
         /// <summary>
@@ -219,7 +219,7 @@ namespace Content.Server.Construction
             anchorable.CancelToken = new CancellationTokenSource();
 
             _tool.UseTool(usingUid, userUid, uid, 0f, anchorable.Delay, usingTool.Qualities,
-                new TryUnanchorCompletedEvent(), new TryUnanchorCancelledEvent(), uid, cancelToken: anchorable.CancelToken.Token);
+                new TryUnanchorCompletedEvent(userUid, usingUid), new TryUnanchorCancelledEvent(userUid, usingUid), uid, cancelToken: anchorable.CancelToken.Token);
         }
 
         /// <summary>
@@ -249,26 +249,40 @@ namespace Content.Server.Construction
         {
             public EntityUid User;
             public EntityUid Using;
+
+            protected AnchorEvent(EntityUid userUid, EntityUid usingUid)
+            {
+                User = userUid;
+                Using = usingUid;
+            }
         }
 
         private sealed class TryUnanchorCompletedEvent : AnchorEvent
         {
-
+            public TryUnanchorCompletedEvent(EntityUid userUid, EntityUid usingUid) : base(userUid, usingUid)
+            {
+            }
         }
 
         private sealed class TryUnanchorCancelledEvent : AnchorEvent
         {
-
+            public TryUnanchorCancelledEvent(EntityUid userUid, EntityUid usingUid) : base(userUid, usingUid)
+            {
+            }
         }
 
         private sealed class TryAnchorCompletedEvent : AnchorEvent
         {
-
+            public TryAnchorCompletedEvent(EntityUid userUid, EntityUid usingUid) : base(userUid, usingUid)
+            {
+            }
         }
 
         private sealed class TryAnchorCancelledEvent : AnchorEvent
         {
-
+            public TryAnchorCancelledEvent(EntityUid userUid, EntityUid usingUid) : base(userUid, usingUid)
+            {
+            }
         }
     }
 }