Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-10-06 10:27:26 +02:00
Code Issues Projects Releases Wiki Activity

Fix false positives with jump+sprint just touching water once.

Browse Source
This commit is contained in:
asofold 2013-03-05 02:31:30 +01:00
parent 323d0f07d1
commit 680bd86dd8
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,7 +143,7 @@ public class SurvivalFly extends Check {
if (hDistanceAboveLimit > 0){
hAllowedDistance = getAllowedhDist(player, from, to, sprinting, hDistance, data, cc, true);
hDistanceAboveLimit = hDistance - hAllowedDistance - data.horizontalFreedom - extraUsed;
if (hAllowedDistance > 0){
if (hAllowedDistance > 0){ // TODO: Fix !
// (Horizontal buffer might still get used.)
tags.add("hspeed");
}
@ -403,8 +403,13 @@ public class SurvivalFly extends Check {
// Check lift-off medium.
// TODO: Web might be NO_JUMP !
// TODO: isNextToGround(0.15, 0.4) allows a little much (yMargin), but reduces false positives.
if (to.isInLiquid() || to.isInWeb()){
if (to.isInLiquid() && to.isNextToGround(0.15, 0.4)){
// TODO: nextToGround: Shortcut with block-flags ?
if (to.isInLiquid()){
if (fromOnGround && !toOnGround && data.mediumLiftOff == MediumLiftOff.GROUND && data.sfJumpPhase <= 1 && !from.isInLiquid()){
data.mediumLiftOff = MediumLiftOff.GROUND;
}
else if (to.isNextToGround(0.15, 0.4)){
// Consent with ground.
data.mediumLiftOff = MediumLiftOff.GROUND;
}
@ -412,12 +417,18 @@ public class SurvivalFly extends Check {
data.mediumLiftOff = MediumLiftOff.LIMIT_JUMP;
}
}
else if (to.isInWeb()){
data.mediumLiftOff = MediumLiftOff.LIMIT_JUMP;
}
else if (resetTo){
// TODO: This might allow jumping on vines etc., but should do for the moment.
data.mediumLiftOff = MediumLiftOff.GROUND;
}
else if (from.isInLiquid()){
if (to.isNextToGround(0.15, 0.4)){
if (!resetTo && data.mediumLiftOff == MediumLiftOff.GROUND && data.sfJumpPhase <= 1){
data.mediumLiftOff = MediumLiftOff.GROUND;
}
else if (to.isNextToGround(0.15, 0.4)){
data.mediumLiftOff = MediumLiftOff.GROUND;
}
else{