fix: do not activate A/FRWK when not trying to climb

Signed-off-by: Octol1ttle <[email protected]>
Octol1ttle · Feb 5, 2024 · ce6af20 · ce6af20
1 parent c9c32fe
commit ce6af20
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/ru/octol1ttle/flightassistant/computers/autoflight/AutoFlightComputer.java b/src/main/java/ru/octol1ttle/flightassistant/computers/autoflight/AutoFlightComputer.java
@@ -48,7 +48,7 @@ public void tick() {
                 if (data.speed < targetSpeed) {
                     firework.activateFirework(false);
                 }
-            } else if (targetAltitude != null && targetAltitude > data.altitude && data.velocity.y < 0.0f) {
+            } else if (targetAltitude != null && targetAltitude > data.altitude && data.pitch > 0 && data.velocity.y < 0.0f) {
                 firework.activateFirework(false);
             }
         }

diff --git a/src/main/java/ru/octol1ttle/flightassistant/indicators/FlightModeIndicator.java b/src/main/java/ru/octol1ttle/flightassistant/indicators/FlightModeIndicator.java
@@ -64,7 +64,7 @@ private void renderFireworkMode(DrawContext context, TextRenderer textRenderer)
                 String type = autoflight.selectedSpeed != null ? ".selected" : ".managed";
                 fireworkMode.update(Text.translatable("flightassistant.mode.firework.speed" + type, targetSpeed));
             } else if (autoflight.getTargetAltitude() != null) {
-                if (autoflight.getTargetAltitude() > data.altitude + 2.0f && data.velocityPerSecond.y < -2.0f) {
+                if (autoflight.getTargetAltitude() > data.altitude + 2.0f && data.pitch > 0 && data.velocity.y < 0.0f) {
                     fireworkMode.update(Text.translatable("flightassistant.mode.firework.climb"));
                 } else {
                     fireworkMode.update(Text.translatable("flightassistant.mode.firework.idle"));