Add guard for not having checked at all.

NoCheatPlus · Mar 25, 2014 · b603416 · b603416
1 parent 90a1255
commit b603416
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/Direction.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/Direction.java
@@ -166,7 +166,10 @@ public boolean loopCheck(final Player player, final Location loc, final Entity d
 	public boolean loopFinish(final Player player, final Location loc, final Entity damaged, final DirectionContext context, final boolean forceViolation, final FightData data, final FightConfig cc) {
 		boolean cancel = false;
 		final double off = forceViolation && context.minViolation != Double.MAX_VALUE ? context.minViolation : context.minResult;
-		if (off > 0.1) {
+		if (off == Double.MAX_VALUE) {
+			return false;
+		}
+		else if (off > 0.1) {
             // Add the overall violation level of the check.
             data.directionVL += context.minViolation;
 
@@ -178,7 +181,8 @@ public boolean loopFinish(final Player player, final Location loc, final Entity
             	// Deal an attack penalty time.
             	data.attackPenalty.applyPenalty(cc.directionPenalty);
             }
-        } else {
+        }
+		else {
         	// Reward the player by lowering their violation level.
             data.directionVL *= 0.8D;
         }

diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FightListener.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FightListener.java
@@ -251,6 +251,7 @@ else if (normalizedMove > 2.0 && Improbable.check(player, 1f, now, "fight.speed"
                 			reachPassed = true;
                 		}
                 	}
+                	// TODO: For efficiency one could omit checking at all if reach is failed all the time.
                 	if (directionEnabled && (reachPassed || !directionPassed)) {
                 		if (direction.loopCheck(player, damagedLoc, damagedPlayer, entry, directionContext, data, cc)) {
                 			thisPassed = false;

diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/Reach.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/Reach.java
@@ -215,6 +215,9 @@ else if (context.pY >= dY + context.damagedHeight) {
 	 */
 	public boolean loopFinish(final Player player, final Location pLoc, final Entity damaged, final ReachContext context, final boolean forceViolation, final FightData data, final FightConfig cc) {
 		final double lenpRel = forceViolation && context.minViolation != Double.MAX_VALUE ? context.minViolation : context.minResult;
+		if (lenpRel == Double.MAX_VALUE) {
+			return false;
+		}
 		double violation = lenpRel - context.distanceLimit;
 		boolean cancel = false;
 		if (violation > 0) {