Fix ghosts having empty names under certain conditions.

Fixes #4731
2021-10-06 11:56:16 +02:00
parent 94a29978b5
commit 1f72435263
4 changed files with 18 additions and 7 deletions
--- a/Content.Server/Administration/Commands/AGhost.cs
+++ b/Content.Server/Administration/Commands/AGhost.cs
@@ -47,7 +47,12 @@ namespace Content.Server.Administration.Commands

            if (canReturn)
            {
-                ghost.Name = mind.CharacterName ?? string.Empty;
+                // TODO: Remove duplication between all this and "GamePreset.OnGhostAttempt()"...
+                if(!string.IsNullOrWhiteSpace(mind.CharacterName))
+                    ghost.Name = mind.CharacterName;
+                else if (!string.IsNullOrWhiteSpace(mind.Session?.Name))
+                    ghost.Name = mind.Session.Name;
+
                mind.Visit(ghost);
            }
            else