Upstream
/
NoCheatPlus
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update SurvivalFly.java (1.13 Swimming) 

Allow for better transition from under water to above water
This commit is contained in:
CaptainObvious0 2019-03-01 14:05:37 -06:00 committed by GitHub
parent 528c650eca
commit 1198a885a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1253,11 +1253,12 @@ public class SurvivalFly extends Check {
// Absolute y-distance to set back.
if (yDistance > 0.0 && !data.isVelocityJumpPhase()) {
// TODO: Only allow higher violation when only in water (1.13 Swimming)
// TODO: Maintain a value in data, adjusting to velocity?
// TODO: LIMIT_JUMP
final double vAllowedAbsoluteDistance = data.liftOffEnvelope.getMaxJumpHeight(data.jumpAmplifier);
final double totalVDistViolation = to.getY() - data.getSetBackY() - vAllowedAbsoluteDistance;
if (totalVDistViolation > 0.0) {
if (totalVDistViolation > 2) {
// Skip actually stepping up.
if ((fromOnGround || thisMove.touchedGroundWorkaround || lastMove.touchedGround)
&& toOnGround && yDistance <= cc.sfStepHeight) {
@ -1317,9 +1318,10 @@ public class SurvivalFly extends Check {
// Air-stay-time.
// TODO: max-phase only when from is not reset !?
// TODO: Only allow higher yDistance when in water (1.13 swimming)
final int maxJumpPhase = data.liftOffEnvelope.getMaxJumpPhase(data.jumpAmplifier);
if (!envelopeHack && data.sfJumpPhase > maxJumpPhase && !data.isVelocityJumpPhase()) {
if (yDistance < 0) {
if (yDistance < 0.5) {
// Ignore falling, and let accounting deal with it.
}
else if (resetFrom) {