hotfix job spawners

Rxup · Feb 4, 2024 · 5572002 · 5572002
1 parent 473630b
commit 5572002
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/Content.Server/Backmen/Fugitive/FugitiveSystem.cs b/Content.Server/Backmen/Fugitive/FugitiveSystem.cs
@@ -77,8 +77,6 @@ public override void Initialize()
         SubscribeLocalEvent<FugitiveComponent, GhostRoleSpawnerUsedEvent>(OnSpawned);
         SubscribeLocalEvent<FugitiveComponent, MindAddedMessage>(OnMindAdded);
         SubscribeLocalEvent<RoundEndTextAppendEvent>(OnRoundEnd);
-        SubscribeLocalEvent<PlayerSpawningEvent>(OnPlayerSpawn,
-            before: new[] { typeof(ContainerSpawnPointSystem),typeof(ArrivalsSystem), typeof(SpawnPointSystem) });
     }
 
     [ValidatePrototypeId<JobPrototype>]
@@ -87,7 +85,7 @@ public override void Initialize()
     [ValidatePrototypeId<JobPrototype>]
     private const string JobSAI = "SAI";
 
-    private void OnPlayerSpawn(PlayerSpawningEvent args)
+    public void HandlePlayerSpawning(PlayerSpawningEvent args)
     {
         if (args.SpawnResult != null)
             return;
@@ -120,6 +118,8 @@ private void OnPlayerSpawn(PlayerSpawningEvent args)
             }
         }
 
+        // auto points
+
         #region Prisoner
 
         if (possiblePositions.Count == 0 && args.Job?.Prototype == JobPrisoner)
@@ -192,9 +192,9 @@ private void OnPlayerSpawn(PlayerSpawningEvent args)
             args.Station);
     }
 
-    public bool MakeFugitive([NotNullWhen(true)] out EntityUid? Fugitive, bool forceHuman = false)
+    public bool MakeFugitive([NotNullWhen(true)] out EntityUid? fugitive, bool forceHuman = false)
     {
-        Fugitive = null;
+        fugitive = null;
 
         EntityUid? station = null;
 
@@ -221,10 +221,10 @@ public bool MakeFugitive([NotNullWhen(true)] out EntityUid? Fugitive, bool force
         }
 
         var coords = _random.Pick(latejoin);
-        Fugitive = Spawn(forceHuman ? SpawnMobPrototype : SpawnPointPrototype, coords);
+        fugitive = Spawn(forceHuman ? SpawnMobPrototype : SpawnPointPrototype, coords);
         if (forceHuman)
         {
-            EnsureComp<FugitiveComponent>(Fugitive.Value).ForcedHuman = true;
+            EnsureComp<FugitiveComponent>(fugitive.Value).ForcedHuman = true;
         }
 
         return true;

diff --git a/Content.Server/Station/Systems/StationSpawningSystem.cs b/Content.Server/Station/Systems/StationSpawningSystem.cs
@@ -49,6 +49,8 @@ public sealed class StationSpawningSystem : SharedStationSpawningSystem
     [Dependency] private readonly ArrivalsSystem _arrivalsSystem = default!;
     [Dependency] private readonly ContainerSpawnPointSystem _containerSpawnPointSystem = default!;
 
+    [Dependency] private readonly Backmen.Fugitive.FugitiveSystem _fugitiveSystem = default!; //backmen: job non-standart spawnpoint
+
     private bool _randomizeCharacters;
 
     private Dictionary<SpawnPriorityPreference, Action<PlayerSpawningEvent>> _spawnerCallbacks = new();
@@ -84,6 +86,8 @@ public override void Initialize()
 
         var ev = new PlayerSpawningEvent(job, profile, station);
 
+        _fugitiveSystem.HandlePlayerSpawning(ev); //backmen: job non-standart spawnpoint
+
         if (station != null && profile != null)
         {
             /// Try to call the character's preferred spawner first.