Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-11-07 11:10:05 +01:00
Code Issues Projects Releases Wiki Activity

Add oddLiquid case for moving out of water with velocity.

Browse Source
This commit is contained in:
asofold 2015-11-17 01:34:57 +01:00
parent 6c74fa0cea
commit c08a670288
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java
View File

@ -1115,10 +1115,18 @@ public class SurvivalFly extends Check {
&& fallingEnvelope(yDistance, data.lastYDist, data.lastFrictionVertical, GRAVITY_ODD / 2.0)
// Falling slightly too slow.
|| yDistDiffEx > 0.0 && data.liftOffEnvelope == LiftOffEnvelope.LIMIT_LIQUID
&& data.lastYDist != Double.MAX_VALUE && data.lastYDist > -2.0 * GRAVITY_MAX - GRAVITY_ODD
&& yDistance < data.lastYDist && data.lastYDist - yDistance < GRAVITY_MAX
&& data.lastYDist - yDistance > GRAVITY_MIN / 4.0
// Falling too slow around 0 yDistance.
&&
(
// Falling too slow around 0 yDistance.
data.lastYDist != Double.MAX_VALUE && data.lastYDist > -2.0 * GRAVITY_MAX - GRAVITY_ODD
&& yDistance < data.lastYDist && data.lastYDist - yDistance < GRAVITY_MAX
&& data.lastYDist - yDistance > GRAVITY_MIN / 4.0
// Moving out of liquid with velocity.
|| data.lastYDist != Double.MAX_VALUE && data.lastYDist > 0.0
&& yDistance < data.lastYDist && yDistance > 0.0 && data.sfJumpPhase == 1
&& data.lastYDist - yDistance > GRAVITY_MAX
&& yDistDiffEx < GRAVITY_MAX + GRAVITY_SPAN && data.isVelocityJumpPhase()
)
);
}