From ce2d0dbc3cc77d574b8f86874540c09975f8c429 Mon Sep 17 00:00:00 2001 From: asofold Date: Mon, 3 Mar 2014 22:52:46 +0100 Subject: [PATCH] Add configurability to enforcing the players location. --- .../neatmonster/nocheatplus/checks/moving/MovingConfig.java | 4 +++- .../java/fr/neatmonster/nocheatplus/config/ConfPaths.java | 2 ++ .../java/fr/neatmonster/nocheatplus/config/DefaultConfig.java | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingConfig.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingConfig.java index 98e03fd8..b6d2e44e 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingConfig.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingConfig.java @@ -140,7 +140,7 @@ public class MovingConfig extends ACheckConfig { public final boolean vehicleEnforceLocation; public final boolean vehiclePreventDestroyOwn; - public final boolean enforceLocation = true; // TODO: Configurable + name. + public final boolean enforceLocation; /** * Instantiates a new moving configuration. @@ -219,6 +219,8 @@ public class MovingConfig extends ACheckConfig { vehicleEnforceLocation = config.getBoolean(ConfPaths.MOVING_VEHICLES_ENFORCELOCATION); vehiclePreventDestroyOwn = config.getBoolean(ConfPaths.MOVING_VEHICLES_PREVENTDESTROYOWN); + + enforceLocation = config.getBoolean(ConfPaths.MOVING_ENFORCELOCATION); } diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java index 8616c6c6..aa30350c 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java @@ -567,11 +567,13 @@ public abstract class ConfPaths { public static final String MOVING_SPRINTINGGRACE = MOVING + "sprintinggrace"; public static final String MOVING_ASSUMESPRINT = MOVING + "assumesprint"; public static final String MOVING_SPEEDGRACE = MOVING + "speedgrace"; + public static final String MOVING_ENFORCELOCATION = MOVING + "enforcelocation"; private static final String MOVING_VEHICLES = MOVING + "vehicles."; public static final String MOVING_VEHICLES_ENFORCELOCATION = MOVING_VEHICLES + "enforcelocation"; public static final String MOVING_VEHICLES_PREVENTDESTROYOWN = MOVING_VEHICLES + "preventdestroyown"; + public static final String STRINGS = "strings"; // Compatibility section (possibly temporary). diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java index c933d066..d6cbf13d 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java @@ -409,6 +409,7 @@ public class DefaultConfig extends ConfigFile { set(ConfPaths.MOVING_SPRINTINGGRACE, 2.0); set(ConfPaths.MOVING_ASSUMESPRINT, true); set(ConfPaths.MOVING_SPEEDGRACE, 4.0); + set(ConfPaths.MOVING_ENFORCELOCATION, true); // TODO: An extra file might suit these. final String start = "[player] failed [check]: ";