From eddec5fcce621f3140abf2ce1acb604fff4c1d51 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Sun, 28 Feb 2021 18:49:46 +0100
Subject: [PATCH] Revert "Fixes a crash when an entity goes off-grid. (hehe)"

This reverts commit 3967ecf098e16ee85ad3a8e2062cd3dcbae5cdda.
---
 .../Physics/Controllers/SharedTileFrictionController.cs   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Content.Shared/Physics/Controllers/SharedTileFrictionController.cs b/Content.Shared/Physics/Controllers/SharedTileFrictionController.cs
index e8b87840ca..a26cc4ffb5 100644
--- a/Content.Shared/Physics/Controllers/SharedTileFrictionController.cs
+++ b/Content.Shared/Physics/Controllers/SharedTileFrictionController.cs
@@ -88,10 +88,14 @@ namespace Content.Shared.Physics.Controllers
         [Pure]
         private float GetTileFriction(IPhysBody body)
         {
-            if (body.BodyStatus == BodyStatus.InAir || !_mapManager.TryGetGrid(body.Owner.Transform.GridID, out var grid))
+            if (body.BodyStatus == BodyStatus.InAir || body.Entity.Transform.GridID == GridId.Invalid)
                 return 0.0f;
 
-            var tile = grid.GetTileRef(body.Owner.Transform.Coordinates);
+            var transform = body.Owner.Transform;
+            var coords = transform.Coordinates;
+
+            var grid = _mapManager.GetGrid(coords.GetGridId(body.Owner.EntityManager));
+            var tile = grid.GetTileRef(coords);
             var tileDef = _tileDefinitionManager[tile.Tile.TypeId];
             return tileDef.Friction;
         }