From 63c1b7b06148bb08045f77b3abd367e984cbd5eb Mon Sep 17 00:00:00 2001 From: "Wrexbe (Josh)" <81056464+wrexbe@users.noreply.github.com> Date: Thu, 31 Aug 2023 11:54:08 -0700 Subject: [PATCH] Fix jetpack (not) running out of fuel (#19696) --- Content.Server/Movement/Systems/JetpackSystem.cs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Content.Server/Movement/Systems/JetpackSystem.cs b/Content.Server/Movement/Systems/JetpackSystem.cs index 4de854f38f..79b365be41 100644 --- a/Content.Server/Movement/Systems/JetpackSystem.cs +++ b/Content.Server/Movement/Systems/JetpackSystem.cs @@ -32,12 +32,17 @@ public sealed class JetpackSystem : SharedJetpackSystem continue; active.TargetTime = _timing.CurTime + TimeSpan.FromSeconds(active.EffectCooldown); - var air = _gasTank.RemoveAir(gasTank, comp.MoleUsage); + var usedAir = _gasTank.RemoveAir(gasTank, comp.MoleUsage); - if (air == null || !MathHelper.CloseTo(air.TotalMoles, comp.MoleUsage, 0.001f)) + if (usedAir == null) + continue; + + var usedEnoughAir = + MathHelper.CloseTo(usedAir.TotalMoles, comp.MoleUsage, comp.MoleUsage/100); + + if (!usedEnoughAir) { toDisable.Add((uid, comp)); - continue; } _gasTank.UpdateUserInterface(gasTank);