diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs index 64bc99f1bb..b257bb5b96 100644 --- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs +++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs @@ -315,6 +315,9 @@ public sealed class ArrivalsSystem : EntitySystem private void OnPlayerSpawn(PlayerSpawningEvent ev) { + if (ev.SpawnResult != null) + return; + // Only works on latejoin even if enabled. if (!Enabled || _ticker.RunLevel != GameRunLevel.InRound) return;