tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Fixes a crash when an entity goes off-grid. (hehe)"

Browse Source 
This reverts commit 3967ecf098.
This commit is contained in:
Pieter-Jan Briers
2021-02-28 18:49:46 +01:00
parent 3967ecf098
commit eddec5fcce
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Shared/Physics/Controllers/SharedTileFrictionController.cs
View File

@@ -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;
}