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

Remove vcliponly option for passable.

Browse Source
This commit is contained in:
asofold 2014-08-17 21:58:52 +02:00
parent 76cdf40485
commit 45aad9c99d
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,7 +104,6 @@ public class MovingConfig extends ACheckConfig {
public final boolean passableCheck; public final boolean passableCheck;
public final boolean passableRayTracingCheck; public final boolean passableRayTracingCheck;
public final boolean passableRayTracingBlockChangeOnly; public final boolean passableRayTracingBlockChangeOnly;
public final boolean passableRayTracingVclipOnly;
// TODO: passableAccuracy: also use if not using ray-tracing // TODO: passableAccuracy: also use if not using ray-tracing
public final ActionList passableActions; public final ActionList passableActions;
@ -196,7 +195,6 @@ public class MovingConfig extends ACheckConfig {
passableCheck = config.getBoolean(ConfPaths.MOVING_PASSABLE_CHECK); passableCheck = config.getBoolean(ConfPaths.MOVING_PASSABLE_CHECK);
passableRayTracingCheck = config.getBoolean(ConfPaths.MOVING_PASSABLE_RAYTRACING_CHECK); passableRayTracingCheck = config.getBoolean(ConfPaths.MOVING_PASSABLE_RAYTRACING_CHECK);
passableRayTracingBlockChangeOnly = config.getBoolean(ConfPaths.MOVING_PASSABLE_RAYTRACING_BLOCKCHANGEONLY); passableRayTracingBlockChangeOnly = config.getBoolean(ConfPaths.MOVING_PASSABLE_RAYTRACING_BLOCKCHANGEONLY);
passableRayTracingVclipOnly = config.getBoolean(ConfPaths.MOVING_PASSABLE_RAYTRACING_VCLIPONLY);
passableActions = config.getOptimizedActionList(ConfPaths.MOVING_PASSABLE_ACTIONS, Permissions.MOVING_PASSABLE); passableActions = config.getOptimizedActionList(ConfPaths.MOVING_PASSABLE_ACTIONS, Permissions.MOVING_PASSABLE);
survivalFlyCheck = config.getBoolean(ConfPaths.MOVING_SURVIVALFLY_CHECK); survivalFlyCheck = config.getBoolean(ConfPaths.MOVING_SURVIVALFLY_CHECK);

3
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/Passable.java
View File

@ -34,7 +34,8 @@ public class Passable extends Check {
} }
boolean toPassable = to.isPassable(); boolean toPassable = to.isPassable();
// General condition check for using ray-tracing. // General condition check for using ray-tracing.
if (toPassable && cc.passableRayTracingCheck && (!cc.passableRayTracingVclipOnly || from.getY() != to.getY()) && (!cc.passableRayTracingBlockChangeOnly || manhattan > 0)) { // TODO: Optimize: manhattan <= 1 and all blocks are completely passable.
if (toPassable && cc.passableRayTracingCheck && (!cc.passableRayTracingBlockChangeOnly || manhattan > 0)) {
rayTracing.set(from, to); rayTracing.set(from, to);
rayTracing.loop(); rayTracing.loop();
if (rayTracing.collides() || rayTracing.getStepsDone() >= rayTracing.getMaxSteps()) { if (rayTracing.collides() || rayTracing.getStepsDone() >= rayTracing.getMaxSteps()) {

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

@ -530,7 +530,6 @@ public abstract class ConfPaths {
private static final String MOVING_PASSABLE_RAYTRACING = MOVING_PASSABLE + "raytracing."; private static final String MOVING_PASSABLE_RAYTRACING = MOVING_PASSABLE + "raytracing.";
public static final String MOVING_PASSABLE_RAYTRACING_CHECK = MOVING_PASSABLE_RAYTRACING + "active"; public static final String MOVING_PASSABLE_RAYTRACING_CHECK = MOVING_PASSABLE_RAYTRACING + "active";
public static final String MOVING_PASSABLE_RAYTRACING_BLOCKCHANGEONLY= MOVING_PASSABLE_RAYTRACING + "blockchangeonly"; public static final String MOVING_PASSABLE_RAYTRACING_BLOCKCHANGEONLY= MOVING_PASSABLE_RAYTRACING + "blockchangeonly";
public static final String MOVING_PASSABLE_RAYTRACING_VCLIPONLY = MOVING_PASSABLE_RAYTRACING + "vcliponly";
public static final String MOVING_PASSABLE_ACTIONS = MOVING_PASSABLE + "actions"; public static final String MOVING_PASSABLE_ACTIONS = MOVING_PASSABLE + "actions";
private static final String MOVING_SURVIVALFLY = MOVING + "survivalfly."; private static final String MOVING_SURVIVALFLY = MOVING + "survivalfly.";
@ -639,5 +638,8 @@ public abstract class ConfPaths {
public static final String MISCELLANEOUS_REPORTTOMETRICS = "miscellaneous.reporttometrics"; public static final String MISCELLANEOUS_REPORTTOMETRICS = "miscellaneous.reporttometrics";
@Deprecated @Deprecated
public static final String BLOCKBREAK_FASTBREAK_MOD_CREATIVE = "checks.blockbreak.fastbreak.intervalcreative"; public static final String BLOCKBREAK_FASTBREAK_MOD_CREATIVE = "checks.blockbreak.fastbreak.intervalcreative";
@Deprecated
public static final String MOVING_PASSABLE_RAYTRACING_VCLIPONLY = "checks.moving.passable.raytracing.vcliponly";
} }

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

@ -377,8 +377,7 @@ public class DefaultConfig extends ConfigFile {
set(ConfPaths.MOVING_PASSABLE_CHECK, true); set(ConfPaths.MOVING_PASSABLE_CHECK, true);
set(ConfPaths.MOVING_PASSABLE_RAYTRACING_CHECK, true); set(ConfPaths.MOVING_PASSABLE_RAYTRACING_CHECK, true);
set(ConfPaths.MOVING_PASSABLE_RAYTRACING_BLOCKCHANGEONLY, true); set(ConfPaths.MOVING_PASSABLE_RAYTRACING_BLOCKCHANGEONLY, false);
set(ConfPaths.MOVING_PASSABLE_RAYTRACING_VCLIPONLY, false);
set(ConfPaths.MOVING_PASSABLE_ACTIONS, "cancel vl>10 log:passable:0:5:if cancel vl>50 log:passable:0:5:icf cancel"); set(ConfPaths.MOVING_PASSABLE_ACTIONS, "cancel vl>10 log:passable:0:5:if cancel vl>50 log:passable:0:5:icf cancel");
set(ConfPaths.MOVING_SURVIVALFLY_CHECK, true); set(ConfPaths.MOVING_SURVIVALFLY_CHECK, true);