From a07e48b73b075d1da204c401a1137b7ef11dfbd3 Mon Sep 17 00:00:00 2001
From: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Date: Tue, 10 Jan 2023 22:39:47 +0100
Subject: [PATCH] Fix not showing player names on context menu for admins
 (#13422)

---
 .../ContextMenu/UI/EntityMenuElement.cs       | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/Content.Client/ContextMenu/UI/EntityMenuElement.cs b/Content.Client/ContextMenu/UI/EntityMenuElement.cs
index 11c9f94089..9ed7c150bc 100644
--- a/Content.Client/ContextMenu/UI/EntityMenuElement.cs
+++ b/Content.Client/ContextMenu/UI/EntityMenuElement.cs
@@ -1,4 +1,6 @@
+using System.Linq;
 using Content.Client.Administration.Managers;
+using Content.Client.Administration.Systems;
 using Content.Shared.Administration;
 using Content.Shared.IdentityManagement;
 using Robust.Client.GameObjects;
@@ -7,6 +9,7 @@ using Robust.Client.UserInterface.Controls;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Maths;
+using Robust.Shared.Utility;
 
 namespace Content.Client.ContextMenu.UI
 {
@@ -14,8 +17,11 @@ namespace Content.Client.ContextMenu.UI
     {
         public const string StyleClassEntityMenuCountText = "contextMenuCount";
 
-        [Dependency] private IEntityManager _entityManager = default!;
-        [Dependency] private IPlayerManager _playerManager = default!;
+        [Dependency] private readonly IClientAdminManager _adminManager = default!;
+        [Dependency] private readonly IEntityManager _entityManager = default!;
+        [Dependency] private readonly IPlayerManager _playerManager = default!;
+
+        private AdminSystem _adminSystem;
 
         /// <summary>
         ///     The entity that can be accessed by interacting with this element.
@@ -37,6 +43,8 @@ namespace Content.Client.ContextMenu.UI
         {
             IoCManager.InjectDependencies(this);
 
+            _adminSystem = _entityManager.System<AdminSystem>();
+
             CountLabel = new Label { StyleClasses = { StyleClassEntityMenuCountText } };
             Icon.AddChild(new LayoutContainer() { Children = { EntityIcon, CountLabel } });
 
@@ -79,10 +87,19 @@ namespace Content.Client.ContextMenu.UI
 
             EntityIcon.Sprite = _entityManager.GetComponentOrNull<ISpriteComponent>(entity);
 
-            var admin = IoCManager.Resolve<IClientAdminManager>();
+            if (_adminManager.HasFlag(AdminFlags.Admin | AdminFlags.Debug))
+            {
+                var representation = _entityManager.ToPrettyString(entity.Value);
+                var name = representation.Name;
+                var id = representation.Uid;
+                var prototype = representation.Prototype;
+                var playerName =
+                    representation.Session?.Name ??
+                    _adminSystem.PlayerList.FirstOrDefault(player => player.EntityUid == entity)?.Username;
+                var deleted = representation.Deleted;
 
-            if (admin.HasFlag(AdminFlags.Admin | AdminFlags.Debug))
-                Text = _entityManager.ToPrettyString(entity.Value);
+                Text = $"{name} ({id}{(representation.Prototype != null ? $", {prototype}" : "")}{(playerName != null ? $", {playerName}" : "")}){(deleted ? "D" : "")}";
+            }
             else
                 Text = Identity.Name(entity.Value, _entityManager, _playerManager.LocalPlayer!.ControlledEntity!);
         }