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

Jetpack fixes (#9107)

Browse Source
This commit is contained in:
metalgearsloth
2022-06-24 19:45:53 +10:00
committed by GitHub
parent 297372fdae
commit 79c1cef566
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Movement/Systems/JetpackSystem.cs
View File

@@ -14,7 +14,7 @@ public sealed class JetpackSystem : SharedJetpackSystem
protected override bool CanEnable(JetpackComponent component)
{
return TryComp<GasTankComponent>(component.Owner, out var gasTank) && !(gasTank.Air.Pressure < component.VolumeUsage);
return TryComp<GasTankComponent>(component.Owner, out var gasTank) && !(gasTank.Air.TotalMoles < component.MoleUsage);
}
public override void Update(float frameTime)
@@ -29,14 +29,14 @@ public sealed class JetpackSystem : SharedJetpackSystem
if (active.Accumulator < UpdateCooldown) continue;
active.Accumulator -= UpdateCooldown;
var air = gasTank.RemoveAir(comp.MoleUsage);
if (gasTank.Air.Pressure < comp.VolumeUsage)
if (air == null || !MathHelper.CloseTo(air.TotalMoles, comp.MoleUsage, 0.1f))
{
toDisable.Add(comp);
continue;
}
gasTank.RemoveAirVolume(comp.VolumeUsage);
gasTank.UpdateUserInterface();
}