Disable terrain, stall and void damage detection when touching water

Signed-off-by: Octol1ttle <[email protected]>
Octol1ttle · Mar 1, 2024 · 83207b4 · 83207b4
1 parent 2a73f19
commit 83207b4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/ru/octol1ttle/flightassistant/computers/safety/GPWSComputer.java b/src/main/java/ru/octol1ttle/flightassistant/computers/safety/GPWSComputer.java
@@ -75,7 +75,7 @@ public boolean shouldBlockPitchChanges() {
     }
 
     private float computeDescentImpactTime() {
-        if (!data.isFlying) {
+        if (!data.isFlying || data.player.isTouchingWater()) {
             return STATUS_UNKNOWN;
         }
         if (data.player.isInvulnerableTo(data.player.getDamageSources().fall())) {
@@ -94,7 +94,7 @@ private float computeDescentImpactTime() {
     }
 
     private float computeTerrainImpactTime() {
-        if (!data.isFlying) {
+        if (!data.isFlying || data.player.isTouchingWater()) {
             return STATUS_UNKNOWN;
         }
         if (data.player.isInvulnerableTo(data.player.getDamageSources().flyIntoWall())) {
@@ -120,7 +120,7 @@ private float computeTerrainImpactTime() {
     }
 
     private boolean computeFireworkUseSafe() {
-        if (!data.isFlying) {
+        if (!data.isFlying || data.player.isTouchingWater()) {
             return true;
         }
         if (data.player.isInvulnerableTo(data.player.getDamageSources().flyIntoWall())) {

diff --git a/src/main/java/ru/octol1ttle/flightassistant/computers/safety/StallComputer.java b/src/main/java/ru/octol1ttle/flightassistant/computers/safety/StallComputer.java
@@ -27,7 +27,7 @@ public void tick() {
     }
 
     private StallStatus computeStalling() {
-        if (!data.isFlying) {
+        if (!data.isFlying || data.player.isTouchingWater()) {
             return StallStatus.UNKNOWN;
         }
         if (data.player.isInvulnerableTo(data.player.getDamageSources().fall())) {
@@ -46,7 +46,7 @@ private StallStatus computeStalling() {
     }
 
     private float computeMaximumSafePitch() {
-        if (!data.isFlying) {
+        if (!data.isFlying || status == StallStatus.UNKNOWN || status == StallStatus.PLAYER_INVULNERABLE) {
             return 90.0f;
         }
         return status == StallStatus.STALL ? -90.0f : MathHelper.clamp(data.speed * 3.0f, 0.0f, 90.0f);

diff --git a/src/main/java/ru/octol1ttle/flightassistant/computers/safety/VoidLevelComputer.java b/src/main/java/ru/octol1ttle/flightassistant/computers/safety/VoidLevelComputer.java
@@ -30,7 +30,7 @@ public void tick() {
     }
 
     private VoidLevelStatus computeStatus() {
-        if (!data.isFlying) {
+        if (!data.isFlying || data.player.isTouchingWater()) {
             return VoidLevelStatus.UNKNOWN;
         }
         if (data.player.isInvulnerableTo(data.player.getDamageSources().outOfWorld())) {