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

SF: Fix problems with continued jumping.

Browse Source 
Especially over stairs one would encounter problems, because the setback
location was not set anymore for the "lost-ground" workaround. This
effectively reverts former removal of setting it then.
This commit is contained in:
asofold 2012-11-04 13:43:35 +01:00
parent ea2960e37f
commit 7a70f0e4a2
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,9 +115,13 @@ public class SurvivalFly extends Check {
// If the player has touched the ground but it hasn't been noticed by the plugin, the workaround is here. // If the player has touched the ground but it hasn't been noticed by the plugin, the workaround is here.
if (!resetFrom){ if (!resetFrom){
// Don't set "useWorkaround = x()", to avoid potential trouble with reordering to come, and similar. // Don't set "useWorkaround = x()", to avoid potential trouble with reordering to come, and similar.
boolean useWorkaround = false; boolean useWorkaround = false;
// Check for moving off stairs. boolean setBackSafe = false; // Let compiler remove this if necessary.
if (!useWorkaround && from.isAboveStairs()) useWorkaround = true; // Check for moving off stairs.
if (!useWorkaround && from.isAboveStairs()) {
useWorkaround = true;
setBackSafe = true;
}
// Check for "lost touch", for when moving events were not created, for instance (1/256). // Check for "lost touch", for when moving events were not created, for instance (1/256).
if (!useWorkaround){ if (!useWorkaround){
final boolean inconsistent = yDistance > 0 && yDistance < 0.5 && data.survivalFlyLastYDist < 0 final boolean inconsistent = yDistance > 0 && yDistance < 0.5 && data.survivalFlyLastYDist < 0
@ -135,16 +139,17 @@ public class SurvivalFly extends Check {
final double minY = Math.min(data.toY, Math.min(data.fromY, from.getY())); final double minY = Math.min(data.toY, Math.min(data.fromY, from.getY()));
final double iY = minY; // TODO ... final double iY = minY; // TODO ...
final double r = from.getWidth() / 2.0; final double r = from.getWidth() / 2.0;
if (BlockProperties.isOnGround(from.getBlockAccess(), Math.min(data.fromX, from.getX()) - r, iY - cc.yOnGround, Math.min(data.fromZ, from.getZ()) - r, Math.max(data.fromX, from.getX()) + r, iY + 0.25, Math.max(data.fromZ, from.getZ()) + r)) useWorkaround = true; if (BlockProperties.isOnGround(from.getBlockAccess(), Math.min(data.fromX, from.getX()) - r, iY - cc.yOnGround, Math.min(data.fromZ, from.getZ()) - r, Math.max(data.fromX, from.getX()) + r, iY + 0.25, Math.max(data.fromZ, from.getZ()) + r)) {
useWorkaround = true;
setBackSafe = true;
}
} }
} }
} }
} }
if (useWorkaround){ // !toOnGround && to.isAboveStairs()) { if (useWorkaround){ // !toOnGround && to.isAboveStairs()) {
// Set the new setBack and reset the jumpPhase. // Set the new setBack and reset the jumpPhase.
if (setBackSafe) data.setBack = from.getLocation();
// Maybe don't adapt the setback (unless null)!
// data.setBack = from.getLocation();
data.setBack.setY(Location.locToBlock(data.setBack.getY())); data.setBack.setY(Location.locToBlock(data.setBack.getY()));
// data.ground ? // data.ground ?
// ? set jumpphase to height / 0.15 ? // ? set jumpphase to height / 0.15 ?