Nullable grid Uid (#8798)

2022-06-20 12:14:35 +12:00
parent ef41cd5aa8
commit fa4c6f63f8
82 changed files with 318 additions and 242 deletions
--- a/Content.Server/Shuttles/Systems/SpaceGarbageSystem.cs
+++ b/Content.Server/Shuttles/Systems/SpaceGarbageSystem.cs
@@ -20,7 +20,7 @@ public sealed class SpaceGarbageSystem : EntitySystem
        var ourXform = Transform(args.OurFixture.Body.Owner);
        var otherXform = Transform(args.OtherFixture.Body.Owner);

-        if (ourXform.GridEntityId == otherXform.GridEntityId ||
+        if (ourXform.GridUid == otherXform.GridUid ||
            args.OtherFixture.Body.BodyType != BodyType.Static) return;

        QueueDel(uid);