Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-12-27 19:07:45 +01:00
Code Issues Projects Releases Wiki Activity

Change buffer amount to positive.

Browse Source
This commit is contained in:
asofold 2013-08-29 21:33:29 +02:00
parent 1d2f291650
commit 048cada0c7
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -246,11 +246,6 @@ public class SurvivalFly extends Check {
} }
} }
// Finally check horizontal buffer regain.
if (hDistanceAboveLimit < 0.0 && hDistance > 0.0 && data.sfHorizontalBuffer < hBufMax) {
hBufRegain(hDistance, hDistanceAboveLimit, data);
}
////////////////////////// //////////////////////////
// Vertical move. // Vertical move.
////////////////////////// //////////////////////////
@ -387,6 +382,12 @@ public class SurvivalFly extends Check {
if (now - data.sfVLTime > cc.survivalFlyVLFreeze) { if (now - data.sfVLTime > cc.survivalFlyVLFreeze) {
data.survivalFlyVL *= 0.95D; data.survivalFlyVL *= 0.95D;
} }
// Finally check horizontal buffer regain.
if (hDistanceAboveLimit < 0.0 && result <= 0.0 && hDistance > 0.0 && data.sfHorizontalBuffer < hBufMax) {
// TODO: max min other conditions ?
hBufRegain(hDistance, Math.min(0.1, Math.abs(hDistanceAboveLimit)), data);
}
} }
// Set data for normal move or violation without cancel (cancel would have returned above) // Set data for normal move or violation without cancel (cancel would have returned above)
@ -929,10 +930,10 @@ public class SurvivalFly extends Check {
/** /**
* Legitimate move: increase horizontal buffer somehow. * Legitimate move: increase horizontal buffer somehow.
* @param hDistance * @param hDistance
* @param hDistanceAboveLimit * @param amount Positive amount.
* @param data * @param data
*/ */
private void hBufRegain(final double hDistance, final double hDistanceAboveLimit, final MovingData data){ private void hBufRegain(final double hDistance, final double amount, final MovingData data){
/* /*
* TODO: Consider different concepts: * TODO: Consider different concepts:
* - full resetting with harder conditions. * - full resetting with harder conditions.
@ -940,7 +941,7 @@ public class SurvivalFly extends Check {
* - reset or regain only every x blocks h distance. * - reset or regain only every x blocks h distance.
*/ */
// TODO: Confine general conditions for buffer regain further (regain in air, whatever)? // TODO: Confine general conditions for buffer regain further (regain in air, whatever)?
data.sfHorizontalBuffer = Math.min(hBufMax, data.sfHorizontalBuffer - hDistanceAboveLimit); data.sfHorizontalBuffer = Math.min(hBufMax, data.sfHorizontalBuffer + amount);
} }
/** /**