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/Station/Systems/StationSystem.cs
+++ b/Content.Server/Station/Systems/StationSystem.cs
@@ -317,13 +317,13 @@ public sealed class StationSystem : EntitySystem
            return CompOrNull<StationMemberComponent>(entity)?.Station;
        }

-        if (xform.GridEntityId == EntityUid.Invalid)
+        if (xform.GridUid == EntityUid.Invalid)
        {
            Logger.Debug("A");
            return null;
        }

-        return CompOrNull<StationMemberComponent>(xform.GridEntityId)?.Station;
+        return CompOrNull<StationMemberComponent>(xform.GridUid)?.Station;
    }
 }