Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix not showing player names on context menu for admins (#13422)

Browse Source
This commit is contained in:
DrSmugleaf
2023-01-10 22:39:47 +01:00
committed by GitHub
parent d547fa4862
commit a07e48b73b
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Content.Client/ContextMenu/UI/EntityMenuElement.cs
View File

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