Fix cargo (again) (#14800)

diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
index 8b150812fe9f423e2cd6304374f2ab8fe737be70..1aa664c9fb3f92d95b0d3a98dccafd5e3118dad8 100644 (file)
--- a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
+++ b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
@@ -452,11 +452,11 @@ public sealed partial class CargoSystem
 
     private void OnCargoFTLStarted(EntityUid uid, CargoShuttleComponent component, ref FTLStartedEvent args)
     {
-        var xform = Transform(uid);
         var stationUid = component.Station;
 
         // Called
-        if (xform.MapID != CargoMap ||
+        if (CargoMap == null ||
+            args.FromMapUid != _mapManager.GetMapEntityId(CargoMap.Value) ||
             !TryComp<StationCargoOrderDatabaseComponent>(stationUid, out var orderDatabase))
         {
             return;