Fix cargo (again) (#14800)

2023-03-23 19:21:12 +11:00
parent c2a17452e7
commit 92dff4a630
1 changed files with 2 additions and 2 deletions
--- 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;