Adjust oddLiquid case (moving out of water with velocity).

NoCheatPlus · Jan 1, 2016 · daf6ab7 · daf6ab7
1 parent 6110e93
commit daf6ab7
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java
@@ -1296,10 +1296,8 @@ && fallingEnvelope(yDistance, lastMove.yDistance, data.lastFrictionVertical, GRA
                                                 && yDistance < lastMove.yDistance && lastMove.yDistance - yDistance < GRAVITY_MAX
                                                 && lastMove.yDistance - yDistance > GRAVITY_MIN / 4.0
                                                 // 2: Moving out of liquid with velocity.
-                                                || lastMove.yDistance > 0.0
-                                                && yDistance < lastMove.yDistance && yDistance > 0.0 && data.sfJumpPhase == 1
-                                                && lastMove.yDistance - yDistance > GRAVITY_MAX
-                                                && yDistDiffEx < GRAVITY_MAX + GRAVITY_SPAN && data.isVelocityJumpPhase()
+                                                || yDistance > 0.0 && data.sfJumpPhase == 1 && yDistDiffEx < 4.0 * GRAVITY_MAX
+                                                && yDistance < lastMove.yDistance - GRAVITY_MAX && data.isVelocityJumpPhase()
                                                 )
                                         )
                                         ; // (return)