From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Thu, 23 Mar 2023 08:21:12 +0000 (+1100)
Subject: Fix cargo (again) (#14800)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=92dff4a6301dfd0d345963a56ecb2da502903499;p=space-station-14.git

Fix cargo (again) (#14800)
---

diff --git a/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs b/Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs
index 8b150812fe..1aa664c9fb 100644
--- 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;