Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2025-01-28 02:11:22 +01:00
Code Issues Projects Releases Wiki Activity

Reduce a special case for false positives in sf.

Browse Source 
There seem to be cases with a repeated horizontal speed increase which
should be covered by the bunnyhop mechanisms. The first increase will
not go as high as possible but have 0 y-diff, while the second one will
trigger a violation with a higher y-diff and another increas in the
horizontal distance. This commit does not cover a general multi-step
speed-increase case, but just attempts to catch this special case.
This commit is contained in:
asofold 2013-10-13 19:15:02 +02:00
parent 9a0225661b
commit 0d52467fc2
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,6 +37,9 @@ import fr.neatmonster.nocheatplus.utilities.build.BuildParameters;
*/ */
public class SurvivalFly extends Check { public class SurvivalFly extends Check {
// Tags
private static final String DOUBLE_BUNNY = "doublebunny";
// Horizontal speeds/modifiers. // Horizontal speeds/modifiers.
public static final double walkSpeed = 0.221D; public static final double walkSpeed = 0.221D;
@ -894,6 +897,16 @@ public class SurvivalFly extends Check {
boolean allowHop = true; boolean allowHop = true;
if (data.bunnyhopDelay > 0 && hDistance > walkSpeed) { // * modSprint){ if (data.bunnyhopDelay > 0 && hDistance > walkSpeed) { // * modSprint){
allowHop = false; // Magic! allowHop = false; // Magic!
// 2x horizontal speed increase detection.
if (hDistance - data.sfLastHDist >= walkSpeed * 0.5 && data.bunnyhopDelay == bunnyHopMax - 1) {
if (data.sfLastYDist == 0.0 && (data.fromWasReset || data.toWasReset) && yDistance >= 0.4) {
// TODO: Confine to last was hop (according to so far input on this topic).
tags.add(DOUBLE_BUNNY);
allowHop = true; // ?, how to mix in with below...
}
}
// Increase buffer if hDistance is decreasing properly. // Increase buffer if hDistance is decreasing properly.
if (data.sfLastHDist != Double.MAX_VALUE && data.sfLastHDist - hDistance >= data.sfLastHDist / bunnyDivFriction && hDistanceAboveLimit <= someThreshold){ if (data.sfLastHDist != Double.MAX_VALUE && data.sfLastHDist - hDistance >= data.sfLastHDist / bunnyDivFriction && hDistanceAboveLimit <= someThreshold){
// Speed must decrease by "a lot" at first, then by some minimal amount per event. // Speed must decrease by "a lot" at first, then by some minimal amount per event.
@ -920,11 +933,13 @@ public class SurvivalFly extends Check {
// Check activation of bunny hop, // Check activation of bunny hop,
// Roughly twice the sprinting speed is reached. // Roughly twice the sprinting speed is reached.
// TODO: Allow slightly higher speed on lost ground. // TODO: Allow slightly higher speed on lost ground.
if (hDistanceAboveLimit > (sprinting ? 0.005 : 0.0016) && hDistanceAboveLimit <= hAllowedDistance + someThreshold if (hDistanceAboveLimit > (sprinting ? 0.005 : 0.0016) && hDistanceAboveLimit <= hAllowedDistance + someThreshold
&& data.mediumLiftOff != MediumLiftOff.LIMIT_JUMP // && yDistance >= 0.4 && (data.mediumLiftOff != MediumLiftOff.LIMIT_JUMP // && yDistance >= 0.4
&& (data.sfLastHDist == Double.MAX_VALUE || hDistance - data.sfLastHDist >= someThreshold ) && (data.sfLastHDist == Double.MAX_VALUE || hDistance - data.sfLastHDist >= someThreshold )
&& (data.sfJumpPhase == 0 && from.isOnGround() || data.sfJumpPhase <= 1 && data.noFallAssumeGround) && (data.sfJumpPhase == 0 && from.isOnGround() || data.sfJumpPhase <= 1 && data.noFallAssumeGround)
&& !from.isResetCond() && !to.isResetCond()) { && !from.isResetCond() && !to.isResetCond()
|| tags.contains(DOUBLE_BUNNY))
) {
// TODO: Jump effect might allow more strictness. // TODO: Jump effect might allow more strictness.
// TODO: Expected minimum gain depends on last speed (!). // TODO: Expected minimum gain depends on last speed (!).
// TODO: Speed effect affects hDistanceAboveLimit? // TODO: Speed effect affects hDistanceAboveLimit?