From 748ca93f5c08302bbfa7762573ad760350f2d722 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Tue, 12 Sep 2023 14:34:20 +1000
Subject: [PATCH] Fix context menu for admin menu (#20030)

---
 .../Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs    | 2 +-
 .../UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs              | 2 +-
 .../UserInterface/Systems/Admin/AdminUIController.cs      | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
index 91a453e416..29f7005754 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
@@ -121,7 +121,7 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab
                     player.Antag ? "YES" : "NO",
                     new StyleBoxFlat(useAltColor ? _altColor : _defaultColor),
                     player.Connected);
-                entry.PlayerUid = _entManager.GetEntity(player.NetEntity);
+                entry.PlayerEntity = player.NetEntity;
                 entry.OnPressed += args => OnEntryPressed?.Invoke(args);
                 PlayerList.AddChild(entry);
 
diff --git a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
index 45cb4b7703..91d04d6754 100644
--- a/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
+++ b/Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTabEntry.xaml.cs
@@ -8,7 +8,7 @@ namespace Content.Client.Administration.UI.Tabs.PlayerTab;
 [GenerateTypedNameReferences]
 public sealed partial class PlayerTabEntry : ContainerButton
 {
-    public EntityUid? PlayerUid;
+    public NetEntity? PlayerEntity;
 
     public PlayerTabEntry(string username, string character, string identity, string job, string antagonist, StyleBox styleBox, bool connected)
     {
diff --git a/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs b/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
index 60d475a4d2..47b93fdb09 100644
--- a/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
+++ b/Content.Client/UserInterface/Systems/Admin/AdminUIController.cs
@@ -154,16 +154,16 @@ public sealed class AdminUIController : UIController, IOnStateEntered<GameplaySt
     private void PlayerTabEntryPressed(ButtonEventArgs args)
     {
         if (args.Button is not PlayerTabEntry button
-            || button.PlayerUid == null)
+            || button.PlayerEntity == null)
             return;
 
-        var uid = button.PlayerUid.Value;
+        var entity = button.PlayerEntity.Value;
         var function = args.Event.Function;
 
         if (function == EngineKeyFunctions.UIClick)
-            _conHost.ExecuteCommand($"vv {uid}");
+            _conHost.ExecuteCommand($"vv {entity}");
         else if (function == EngineKeyFunctions.UseSecondary)
-            _verb.OpenVerbMenu(uid, true);
+            _verb.OpenVerbMenu(EntityManager.GetEntity(entity), true);
         else
             return;
 
-- 
2.51.2