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

Fix magboot check (#13076)

Browse Source
This commit is contained in:
Leon Friedrich
2022-12-19 10:24:43 +13:00
committed by GitHub
parent decce17e94
commit 5a5cf2cc87
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,16 +32,19 @@ namespace Content.Shared.Gravity
// If grid / map has gravity // If grid / map has gravity
if (TryComp<GravityComponent>(xform.GridUid, out var gravity) && gravity.Enabled || if (TryComp<GravityComponent>(xform.GridUid, out var gravity) && gravity.Enabled ||
TryComp(xform.MapUid, out gravity) && gravity.Enabled) TryComp<GravityComponent>(xform.MapUid, out var mapGravity) && mapGravity.Enabled)
{ {
return false; return false;
} }
// Something holding us down var hasGrav = gravity != null || mapGravity != null;
// Check for something holding us down
// If the planet has gravity component and no gravity it will still give gravity // If the planet has gravity component and no gravity it will still give gravity
// If there's no gravity comp at all (i.e. space) then they don't work. // If there's no gravity comp at all (i.e. space) then they don't work.
if (gravity != null && _inventory.TryGetSlotEntity(uid, "shoes", out var ent)) if (hasGrav && _inventory.TryGetSlotEntity(uid, "shoes", out var ent))
{ {
// TODO this should just be a event that gets relayed instead of a specific slot & component check.
if (TryComp<MagbootsComponent>(ent, out var boots) && boots.On) if (TryComp<MagbootsComponent>(ent, out var boots) && boots.On)
return false; return false;
} }