Remove reference to deleted mind (#14101)

diff --git a/Content.Server/GameTicking/GameTicker.GamePreset.cs b/Content.Server/GameTicking/GameTicker.GamePreset.cs
index cedc88cba4a29c6ad235eb9f17980605222d7f8c..7956a3d7d8b165ec9056fb76d2fcb5ad8ee6fc3a 100644 (file)
--- a/Content.Server/GameTicking/GameTicker.GamePreset.cs
+++ b/Content.Server/GameTicking/GameTicker.GamePreset.cs
@@ -183,6 +183,9 @@ namespace Content.Server.GameTicking
                 ? Transform(playerEntity.Value).Coordinates
                 : GetObserverSpawnPoint();
 
+            if (position == default)
+                return false;
+
             // Ok, so, this is the master place for the logic for if ghosting is "too cheaty" to allow returning.
             // There's no reason at this time to move it to any other place, especially given that the 'side effects required' situations would also have to be moved.
             // + If CharacterDeadPhysically applies, we're physically dead. Therefore, ghosting OK, and we can return (this is critical for gibbing)

diff --git a/Content.Server/Mind/MindSystem.cs b/Content.Server/Mind/MindSystem.cs
index ca4851b652006be7d69095e8174de5305378238f..549f85e1088bf58a8b07ecb11e06d6ed7594a336 100644 (file)
--- a/Content.Server/Mind/MindSystem.cs
+++ b/Content.Server/Mind/MindSystem.cs
@@ -107,6 +107,7 @@ public sealed class MindSystem : EntitySystem
                     {
                         // This should be an error, if it didn't cause tests to start erroring when they delete a player.
                         Logger.WarningS("mind", $"Entity \"{ToPrettyString(uid)}\" for {mind.Mind?.CharacterName} was deleted, and no applicable spawn location is available.");
+                        mind.Mind?.TransferTo(null);
                         return;
                     }