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

Fix weightless (#9939)

Browse Source
This commit is contained in:
metalgearsloth
2022-07-21 11:48:49 +10:00
committed by GitHub
parent a91c32a5e7
commit e82e171ce6
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Shared/Gravity/SharedGravitySystem.cs
View File

@@ -23,10 +23,16 @@ namespace Content.Shared.Gravity
if (!Resolve(uid, ref xform)) return true; if (!Resolve(uid, ref xform)) return true;
bool gravityEnabled = false;
// If grid / map has gravity // If grid / map has gravity
if ((TryComp<GravityComponent>(xform.GridUid, out var gravity) || if ((TryComp<GravityComponent>(xform.GridUid, out var gravity) ||
TryComp(xform.MapUid, out gravity)) && gravity.Enabled) TryComp(xform.MapUid, out gravity)) && gravity.Enabled)
return false; {
gravityEnabled = gravity.Enabled;
if (gravityEnabled) return false;
}
// On the map then always weightless (unless it has gravity comp obv). // On the map then always weightless (unless it has gravity comp obv).
if (!_mapManager.TryGetGrid(xform.GridUid, out var grid)) if (!_mapManager.TryGetGrid(xform.GridUid, out var grid))
@@ -39,7 +45,7 @@ namespace Content.Shared.Gravity
return false; return false;
} }
if (!xform.Coordinates.IsValid(EntityManager)) return true; if (!gravityEnabled || !xform.Coordinates.IsValid(EntityManager)) return true;
var tile = grid.GetTileRef(xform.Coordinates).Tile; var tile = grid.GetTileRef(xform.Coordinates).Tile;
return tile.IsEmpty; return tile.IsEmpty;