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.Shared/Friction/SharedTileFrictionController.cs
+++ b/Content.Shared/Friction/SharedTileFrictionController.cs
@@ -161,7 +161,7 @@ namespace Content.Shared.Friction

            // TODO: Make IsWeightless event-based; we already have grid traversals tracked so just raise events
            if (body.Owner.IsWeightless(body, coords, _mapManager) ||
-                !_mapManager.TryGetGrid(xform.GridEntityId, out var grid))
+                !_mapManager.TryGetGrid(xform.GridUid, out var grid))
                return 0.0f;

            if (!coords.IsValid(EntityManager)) return 0.0f;