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

Remove reference to deleted mind (#14101)

Browse Source
This commit is contained in:
Leon Friedrich
2023-02-14 15:46:44 +13:00
committed by GitHub
parent fb23370938
commit 9c6c6a797a
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Server/GameTicking/GameTicker.GamePreset.cs
View File

@@ -183,6 +183,9 @@ namespace Content.Server.GameTicking
? Transform(playerEntity.Value).Coordinates ? Transform(playerEntity.Value).Coordinates
: GetObserverSpawnPoint(); : 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. // 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. // 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) // + If CharacterDeadPhysically applies, we're physically dead. Therefore, ghosting OK, and we can return (this is critical for gibbing)

1
Content.Server/Mind/MindSystem.cs
View File

@@ -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. // 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."); Logger.WarningS("mind", $"Entity \"{ToPrettyString(uid)}\" for {mind.Mind?.CharacterName} was deleted, and no applicable spawn location is available.");
mind.Mind?.TransferTo(null);
return; return;
} }