Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-19 18:31:23 +02:00
Code Issues Projects Releases Wiki Activity

Reset jumpphase and setback for moving in/onto laddrs/vines in any case.

Browse Source
This commit is contained in:
asofold 2012-09-21 15:07:59 +02:00
parent 2aea67b463
commit 2cf9f5f9f8
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/fr/neatmonster/nocheatplus/checks/moving/SurvivalFly.java
View File

@ -250,19 +250,25 @@ public class SurvivalFly extends Check {
data.setBack = to.getLocation();
data.setBack.setY(Math.ceil(data.setBack.getY()));
data.survivalFlyJumpPhase = 0;
} else if ((to.isInWeb() || to.isOnLadder() || toOnGround)
&& (from.getY() >= to.getY() || data.setBack.getY() <= Math.floor(to.getY()))) {
// If the player moved down "onto" the ground and the new setback point is higher up than the old or at
// least at the same height, or if the player is in web or on a ladder.
} else if (to.isOnLadder()
|| (to.isInWeb() || toOnGround) && (from.getY() >= to.getY() || data.setBack.getY() <= Math.floor(to.getY()))) {
// Set set back and jump phase, if:
// 1. Moving onto ladder/vine.
/*
* 2. If the player moved down "onto" the ground or in web and ...
* the new setback point is higher up than the old or at
* least at the same height.
*/
data.setBack = to.getLocation();
data.survivalFlyJumpPhase = 0;
} else {
if (from.isInLiquid() || fromOnGround || from.isInWeb() || from.isOnLadder())
data.setBack = from.getLocation();
if (from.isInLiquid() || to.isInLiquid() || from.isInWeb() || to.isInWeb() || fromOnGround
|| toOnGround || from.isOnLadder() || to.isOnLadder())
// The player at least touched the ground somehow.
data.survivalFlyJumpPhase = 0;
if (from.isInLiquid() || fromOnGround || from.isInWeb() || from.isOnLadder()){
data.setBack = from.getLocation();
if ( to.isInLiquid() || to.isInWeb() || toOnGround || to.isOnLadder()){
// The player at least touched the ground somehow.
data.survivalFlyJumpPhase = 0;
}
}
}
return null;