Merge branch 'master' into spaceprison

Space-Stories · Jul 17, 2024 · 6fb489f · 6fb489f
2 parents aafe399 + 557ee92
commit 6fb489f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs b/Content.Server/Spawners/EntitySystems/SpawnPointSystem.cs
@@ -51,9 +51,9 @@ private void OnPlayerSpawning(PlayerSpawningEvent args)
             // TODO: Refactor gameticker spawning code so we don't have to do this!
             var points2 = EntityQueryEnumerator<SpawnPointComponent, TransformComponent>();
 
-            if (points2.MoveNext(out var spawnPoint, out var xform))
+            if (points2.MoveNext(out var spawnPointUid, out var spawnPoint, out var xform)) // Stories
             {
-                possiblePositions.Add(xform.Coordinates);
+                if (spawnPoint.SpawnType == SpawnPointType.LateJoin && _stationSystem.GetOwningStation(spawnPointUid, xform) == args.Station) possiblePositions.Add(xform.Coordinates); // Stories. Лучше спавнить в позднем присоед., чем вообще в любой точке.
             }
             else
             {