Unrevert "Remove references to obsolete GridId" (#11531) (#11801)

2022-10-10 10:41:32 +13:00
parent e17e08f344
commit 41b1044ddb
7 changed files with 30 additions and 32 deletions
--- a/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
+++ b/Content.Server/Shuttles/Systems/ShuttleSystem.FasterThanLight.cs
@@ -97,7 +97,7 @@ public sealed partial class ShuttleSystem

        foreach (var other in _mapManager.FindGridsIntersecting(xform.MapID, bounds))
        {
-            if (grid.GridIndex == other.Index ||
+            if (grid.Owner == other.GridEntityId ||
                !bodyQuery.TryGetComponent(other.GridEntityId, out var body) ||
                body.Mass < ShuttleFTLMassThreshold) continue;