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

Remove the unused velocitygraceticks thing.

Browse Source
This commit is contained in:
asofold 2015-11-28 09:54:27 +01:00
parent 92b5d0ff60
commit 6e602af816
4 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingConfig.java
View File

@ -152,9 +152,9 @@ public class MovingConfig extends ACheckConfig {
public final double sfHoverViolation; public final double sfHoverViolation;
// Special tolerance values: // Special tolerance values:
/** This is not strictly ticks, but packets, for now.*/ /** Number of moving packets until which a velocity entry must be activated, in order to not be removed.*/
public final int velocityGraceTicks;
public final int velocityActivationCounter; public final int velocityActivationCounter;
/** Server ticks until invalidating queues velocity. */
public final int velocityActivationTicks; public final int velocityActivationTicks;
public final boolean velocityStrictInvalidation; public final boolean velocityStrictInvalidation;
public final double noFallyOnGround; public final double noFallyOnGround;
@ -262,7 +262,6 @@ public class MovingConfig extends ACheckConfig {
sfHoverFallDamage = config.getBoolean(ConfPaths.MOVING_SURVIVALFLY_HOVER_FALLDAMAGE); sfHoverFallDamage = config.getBoolean(ConfPaths.MOVING_SURVIVALFLY_HOVER_FALLDAMAGE);
sfHoverViolation = config.getDouble(ConfPaths.MOVING_SURVIVALFLY_HOVER_SFVIOLATION); sfHoverViolation = config.getDouble(ConfPaths.MOVING_SURVIVALFLY_HOVER_SFVIOLATION);
velocityGraceTicks = config.getInt(ConfPaths.MOVING_VELOCITY_GRACETICKS);
velocityActivationCounter = config.getInt(ConfPaths.MOVING_VELOCITY_ACTIVATIONCOUNTER); velocityActivationCounter = config.getInt(ConfPaths.MOVING_VELOCITY_ACTIVATIONCOUNTER);
velocityActivationTicks = config.getInt(ConfPaths.MOVING_VELOCITY_ACTIVATIONTICKS); velocityActivationTicks = config.getInt(ConfPaths.MOVING_VELOCITY_ACTIVATIONTICKS);
velocityStrictInvalidation = config.getBoolean(ConfPaths.MOVING_VELOCITY_STRICTINVALIDATION); velocityStrictInvalidation = config.getBoolean(ConfPaths.MOVING_VELOCITY_STRICTINVALIDATION);

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

@ -469,14 +469,6 @@ public class SurvivalFly extends Check {
data.insideMediumCount ++; data.insideMediumCount ++;
} }
// // Invalidation of vertical velocity.
// // TODO: This invalidation is wrong in case of already jumped higher (can not be repaired?).
// if (yDistance <= 0 && data.sfLastYDist > 0 && data.sfLastYDist != Double.MAX_VALUE
// && data.invalidateVerVelGrace(cc.velocityGraceTicks, false)) {
// // (Only prevent counting further up, leaves the freedom.)
// tags.add("cap_vvel"); // TODO: Test / validate by logs.
// }
// Apply reset conditions. // Apply reset conditions.
if (resetTo) { if (resetTo) {
// The player has moved onto ground. // The player has moved onto ground.
@ -525,11 +517,6 @@ public class SurvivalFly extends Check {
// Invalidate used horizontal velocity. // Invalidate used horizontal velocity.
// NCPAPIProvider.getNoCheatPlusAPI().getLogManager().debug(Streams.TRACE_FILE, "*** INVALIDATE ON SPEED"); // NCPAPIProvider.getNoCheatPlusAPI().getLogManager().debug(Streams.TRACE_FILE, "*** INVALIDATE ON SPEED");
data.clearActiveHorVel(); data.clearActiveHorVel();
// if (data.horizontalVelocityUsed > cc.velocityGraceTicks) {
// data.horizontalFreedom = 0;
// data.horizontalVelocityCounter = 0;
// data.horizontalVelocityUsed = 0;
// }
} }
// Adjust data. // Adjust data.
data.toWasReset = resetTo || data.noFallAssumeGround; data.toWasReset = resetTo || data.noFallAssumeGround;

3
NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java
View File

@ -582,7 +582,6 @@ public abstract class ConfPaths {
// Special (to be sorted in or factored out). // Special (to be sorted in or factored out).
private static final String MOVING_VELOCITY = MOVING + "velocity."; private static final String MOVING_VELOCITY = MOVING + "velocity.";
public static final String MOVING_VELOCITY_GRACETICKS = MOVING_VELOCITY + "graceticks";
public static final String MOVING_VELOCITY_ACTIVATIONCOUNTER = MOVING_VELOCITY + "activationcounter"; public static final String MOVING_VELOCITY_ACTIVATIONCOUNTER = MOVING_VELOCITY + "activationcounter";
public static final String MOVING_VELOCITY_ACTIVATIONTICKS = MOVING_VELOCITY + "activationticks"; public static final String MOVING_VELOCITY_ACTIVATIONTICKS = MOVING_VELOCITY + "activationticks";
public static final String MOVING_VELOCITY_STRICTINVALIDATION = MOVING_VELOCITY + "strictinvalidation"; public static final String MOVING_VELOCITY_STRICTINVALIDATION = MOVING_VELOCITY + "strictinvalidation";
@ -729,5 +728,7 @@ public abstract class ConfPaths {
public static final String MOVING_SURVIVALFLY_BEDSTEP ="checks.moving.survivalfly.bedstep"; public static final String MOVING_SURVIVALFLY_BEDSTEP ="checks.moving.survivalfly.bedstep";
@Deprecated @Deprecated
public static final String LOGGING_BACKEND_CONSOLE_PREFIX = "logging.backend.console.prefix"; public static final String LOGGING_BACKEND_CONSOLE_PREFIX = "logging.backend.console.prefix";
@Deprecated
public static final String MOVING_VELOCITY_GRACETICKS = "checks.moving.velocity.graceticks";
} }

1
NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java
View File

@ -429,7 +429,6 @@ public class DefaultConfig extends ConfigFile {
set(ConfPaths.MOVING_VEHICLES_ENFORCELOCATION, "default"); set(ConfPaths.MOVING_VEHICLES_ENFORCELOCATION, "default");
// Velocity. // Velocity.
set(ConfPaths.MOVING_VELOCITY_GRACETICKS, 20);
set(ConfPaths.MOVING_VELOCITY_ACTIVATIONCOUNTER, 80); set(ConfPaths.MOVING_VELOCITY_ACTIVATIONCOUNTER, 80);
set(ConfPaths.MOVING_VELOCITY_ACTIVATIONTICKS, 140); set(ConfPaths.MOVING_VELOCITY_ACTIVATIONTICKS, 140);
set(ConfPaths.MOVING_VELOCITY_STRICTINVALIDATION, true); set(ConfPaths.MOVING_VELOCITY_STRICTINVALIDATION, true);