From 8401b94b702557b9de312062bae2b214c6842891 Mon Sep 17 00:00:00 2001 From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com> Date: Thu, 12 Sep 2024 14:04:48 +1000 Subject: [PATCH] Fix latejoins (#32093) For realsies :) --- Content.Server/Shuttles/Systems/ArrivalsSystem.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs index 82a38f5f00..46d2cd69b9 100644 --- a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs +++ b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs @@ -92,7 +92,7 @@ public sealed class ArrivalsSystem : EntitySystem { base.Initialize(); - SubscribeLocalEvent(HandlePlayerSpawning, before: new []{ typeof(ContainerSpawnPointSystem), typeof(SpawnPointSystem)}); + SubscribeLocalEvent(HandlePlayerSpawning, before: new []{ typeof(SpawnPointSystem)}, after: new [] { typeof(ContainerSpawnPointSystem)}); SubscribeLocalEvent(OnStationPostInit); @@ -335,8 +335,7 @@ public sealed class ArrivalsSystem : EntitySystem if (ev.SpawnResult != null) return; - if (ev.HumanoidCharacterProfile?.SpawnPriority != SpawnPriorityPreference.Arrivals) - return; + // We use arrivals as the default spawn so don't check for job prio. // Only works on latejoin even if enabled. if (!Enabled || _ticker.RunLevel != GameRunLevel.InRound) -- 2.52.0