Merge branch 'march-2024-upstream-merge' of https://github.com/new-fr…

…ontiers-14/frontier-station-14 into pr/1207
new-frontiers-14 · Apr 21, 2024 · 75d2090 · 75d2090
2 parents 25b1a97 + 0a456c1
commit 75d2090
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Content.Server/Salvage/SalvageSystem.Runner.cs b/Content.Server/Salvage/SalvageSystem.Runner.cs
@@ -204,12 +204,10 @@ private void UpdateRunner()
 
                             //this whole code snippet makes me question humanity. the following code block is a fix for frontier.
                             var mapId = _gameTicker.DefaultMap;
+                            var mapUid = _mapManager.GetMapEntityId(mapId);
                             var dropLocation = _random.NextVector2(750, 2750);
-                            var coords = new MapCoordinates(dropLocation, mapId);
-                            var location = Spawn(null, coords);
-                            var despawn = EnsureComp<TimedDespawnComponent>(location);
-                            despawn.Lifetime = 600;
-                            _shuttle.FTLToCoordinates(shuttleUid, shuttle, location.ToCoordinates(), ftlTime);
+
+                            _shuttle.FTLToCoordinates(shuttleUid, shuttle, new EntityCoordinates(mapUid, dropLocation), 0f, 5.5f, 50f);
                         }
 
                         break;

diff --git a/Content.Server/Salvage/SpawnSalvageMissionJob.cs b/Content.Server/Salvage/SpawnSalvageMissionJob.cs
@@ -183,7 +183,7 @@ protected override async Task<bool> Process()
         if (shuttleUid is { Valid : true } vesselUid)
         {
             var shuttle = _entManager.GetComponent<ShuttleComponent>(vesselUid);
-            _shuttle.FTLToCoordinates(vesselUid, shuttle, new EntityCoordinates(mapUid, Vector2.Zero), 5.5f, 50f);
+            _shuttle.FTLToCoordinates(vesselUid, shuttle, new EntityCoordinates(mapUid, Vector2.Zero), 0f, 5.5f, 50f);
         }
 
         var landingPadRadius = 38; //we go a liiitle bigger for the shipses