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

Fix planet tile friction (#12886)

Browse Source 
Falls back to default friction on empty tiles where a planet has gravity.
This commit is contained in:
metalgearsloth
2022-12-05 14:47:08 +11:00
committed by GitHub
parent e776d01df0
commit b4f4de211e
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Shared/Friction/TileFrictionController.cs
View File

@@ -7,6 +7,7 @@ using JetBrains.Annotations;
using Robust.Shared.Configuration; using Robust.Shared.Configuration;
using Robust.Shared.GameStates; using Robust.Shared.GameStates;
using Robust.Shared.Map; using Robust.Shared.Map;
using Robust.Shared.Map.Components;
using Robust.Shared.Physics.Components; using Robust.Shared.Physics.Components;
using Robust.Shared.Physics.Controllers; using Robust.Shared.Physics.Controllers;
using Robust.Shared.Physics.Dynamics; using Robust.Shared.Physics.Dynamics;
@@ -198,6 +199,14 @@ namespace Content.Shared.Friction
if (_mapManager.TryGetGrid(xform.GridUid, out var grid)) if (_mapManager.TryGetGrid(xform.GridUid, out var grid))
{ {
var tile = grid.GetTileRef(xform.Coordinates); var tile = grid.GetTileRef(xform.Coordinates);
// If it's a map but on an empty tile then just assume it has gravity.
if (tile.Tile.IsEmpty && HasComp<MapComponent>(xform.GridUid) &&
(!TryComp<GravityComponent>(xform.GridUid, out var gravity) || gravity.Enabled))
{
return DefaultFriction;
}
var tileDef = _tileDefinitionManager[tile.Tile.TypeId]; var tileDef = _tileDefinitionManager[tile.Tile.TypeId];
return tileDef.Friction; return tileDef.Friction;
} }