Some manual GetComponentOrNull inlines

2021-12-03 15:09:45 +01:00
parent a5b57c8e10
commit 61be228ad0
10 changed files with 48 additions and 25 deletions
--- a/Content.Server/Administration/AdminSystem.cs
+++ b/Content.Server/Administration/AdminSystem.cs
@@ -123,7 +123,11 @@ namespace Content.Server.Administration
        private PlayerInfo GetPlayerInfo(IPlayerSession session)
        {
            var name = session.Name;
-            var username = session.AttachedEntity?.Name ?? string.Empty;
+            var username = string.Empty;
+
+            if(session.AttachedEntity != null)
+                username = session.AttachedEntity.Name;
+
            var antag = session.ContentData()?.Mind?.AllRoles.Any(r => r.Antagonist) ?? false;
            var uid = session.AttachedEntity?.Uid ?? EntityUid.Invalid;