123 456 789 10

SerbiaStrong-220 · Feb 23, 2025 · 2cdf220 · 2cdf220
1 parent 26ec7c4
commit 2cdf220
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -996,17 +996,15 @@ private string GetChatName(EntityUid entity)
             return null;
 
         if (TryComp<PdaComponent>(idUid, out var pda) &&
-            pda.ContainedId != null &&
             TryComp<IdCardComponent>(pda.ContainedId, out var idComp) &&
             !string.IsNullOrEmpty(idComp.FullName))
         {
             return idComp.FullName;
         }
 
-        if (TryComp<IdCardComponent>(pda?.ContainedId ?? idUid, out var id) && !string.IsNullOrEmpty(id.FullName))
-            return id.FullName;
-
-        return null;
+        return TryComp<IdCardComponent>(pda?.ContainedId ?? idUid, out var id) && !string.IsNullOrEmpty(id.FullName)
+            ? id.FullName
+            : null;
     }
 
     private bool IsIdentityHidden(EntityUid entity)