Fix Arrivals Not Respecting Force Spawn

Simple-Station · Oct 20, 2024 · 8dd91f7 · 8dd91f7
1 parent 5e575d8
commit 8dd91f7
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/Content.Server/Shuttles/Systems/ArrivalsSystem.cs b/Content.Server/Shuttles/Systems/ArrivalsSystem.cs
@@ -18,6 +18,7 @@
 using Content.Shared.Mobs.Components;
 using Content.Shared.Movement.Components;
 using Content.Shared.Parallax.Biomes;
+using Content.Shared.Roles;
 using Content.Shared.Salvage;
 using Content.Shared.Shuttles.Components;
 using Content.Shared.Tiles;
@@ -311,6 +312,12 @@ public void HandlePlayerSpawning(PlayerSpawningEvent ev)
         if (!Enabled || _ticker.RunLevel != GameRunLevel.InRound)
             return;
 
+        if (ev.Job is not null
+            && ev.Job.Prototype is not null
+            && _protoManager.Index<JobPrototype>(ev.Job.Prototype.Value.Id).AlwaysUseSpawner)
+            return;
+
+
         if (!HasComp<StationArrivalsComponent>(ev.Station))
             return;