From 7d2c1ce1f8b40fac554cdef8040576d9f88503ef Mon Sep 17 00:00:00 2001 From: asofold Date: Thu, 3 Mar 2016 15:45:48 +0100 Subject: [PATCH] Re-enable split move handling for MC 1.9. --- .../neatmonster/nocheatplus/checks/moving/MovingConfig.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 514c6b50..e2626e4b 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 @@ -281,9 +281,10 @@ public class MovingConfig extends ACheckConfig { yOnGround = config.getDouble(ConfPaths.MOVING_YONGROUND, Y_ON_GROUND_MIN, Y_ON_GROUND_MAX, Y_ON_GROUND_DEFAULT); // sqrt(1/256), see: NetServerHandler. noFallyOnGround = config.getDouble(ConfPaths.MOVING_NOFALL_YONGROUND, Y_ON_GROUND_MIN, Y_ON_GROUND_MAX, yOnGround); - // TODO: Ignore the stance, once it is known that the server catches such. AlmostBoolean refSplitMoves = config.getAlmostBoolean(ConfPaths.MOVING_SPLITMOVES, AlmostBoolean.MAYBE); - splitMoves = refSplitMoves == AlmostBoolean.MAYBE ? ServerVersion.compareMinecraftVersion("1.9") == -1 : refSplitMoves.decide(); + //splitMoves = refSplitMoves == AlmostBoolean.MAYBE ? ServerVersion.compareMinecraftVersion("1.9") == -1 : refSplitMoves.decide(); + splitMoves = refSplitMoves.decideOptimistically(); + // TODO: Ignore the stance, once it is known that the server catches such. AlmostBoolean refIgnoreStance = config.getAlmostBoolean(ConfPaths.MOVING_IGNORESTANCE, AlmostBoolean.MAYBE); ignoreStance = refIgnoreStance == AlmostBoolean.MAYBE ? ServerVersion.compareMinecraftVersion("1.8") >= 0 : refIgnoreStance.decide(); tempKickIllegal = config.getBoolean(ConfPaths.MOVING_TEMPKICKILLEGAL);