tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed spawn priority to arrivals -> containers -> points. (#24476)

Browse Source
This commit is contained in:
Krunklehorn
2024-01-24 19:48:58 -05:00
committed by GitHub
parent 055bc72e06
commit 00c83844ac
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Shuttles/Systems/ArrivalsSystem.cs
View File

@@ -81,7 +81,7 @@ public sealed class ArrivalsSystem : EntitySystem
{ {
base.Initialize(); base.Initialize();
SubscribeLocalEvent<PlayerSpawningEvent>(OnPlayerSpawn, before: new[] { typeof(SpawnPointSystem) }); SubscribeLocalEvent<PlayerSpawningEvent>(OnPlayerSpawn, before: new[] { typeof(SpawnPointSystem), typeof(ContainerSpawnPointSystem) });
SubscribeLocalEvent<StationArrivalsComponent, ComponentStartup>(OnArrivalsStartup); SubscribeLocalEvent<StationArrivalsComponent, ComponentStartup>(OnArrivalsStartup);
SubscribeLocalEvent<ArrivalsShuttleComponent, ComponentStartup>(OnShuttleStartup); SubscribeLocalEvent<ArrivalsShuttleComponent, ComponentStartup>(OnShuttleStartup);

2
Content.Server/Spawners/EntitySystems/ContainerSpawnPointSystem.cs
View File

@@ -18,7 +18,7 @@ public sealed class ContainerSpawnPointSystem : EntitySystem
public override void Initialize() public override void Initialize()
{ {
SubscribeLocalEvent<PlayerSpawningEvent>(OnSpawnPlayer, before: new[] { typeof(SpawnPointSystem), typeof(ArrivalsSystem) }); SubscribeLocalEvent<PlayerSpawningEvent>(OnSpawnPlayer, before: new[] { typeof(SpawnPointSystem) }, after: new[] { typeof(ArrivalsSystem) });
} }
private void OnSpawnPlayer(PlayerSpawningEvent args) private void OnSpawnPlayer(PlayerSpawningEvent args)

3
Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs
View File

@@ -1,4 +1,5 @@
using Content.Server.GameTicking; using Content.Server.GameTicking;
using Content.Server.Shuttles.Systems;
using Content.Server.Spawners.Components; using Content.Server.Spawners.Components;
using Content.Server.Station.Systems; using Content.Server.Station.Systems;
using Robust.Shared.Map; using Robust.Shared.Map;
@@ -15,7 +16,7 @@ public sealed class SpawnPointSystem : EntitySystem
public override void Initialize() public override void Initialize()
{ {
SubscribeLocalEvent<PlayerSpawningEvent>(OnSpawnPlayer); SubscribeLocalEvent<PlayerSpawningEvent>(OnSpawnPlayer, after: new[] { typeof(ContainerSpawnPointSystem), typeof(ArrivalsSystem) });
} }
private void OnSpawnPlayer(PlayerSpawningEvent args) private void OnSpawnPlayer(PlayerSpawningEvent args)