From dd9e5d3873c78074206858208383b7de0dbfec7c Mon Sep 17 00:00:00 2001 From: asofold Date: Fri, 8 Feb 2013 11:10:51 +0100 Subject: [PATCH] Code simplification. --- .../nocheatplus/checks/moving/MovingListener.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java index 908158af..d5df45c7 100644 --- a/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java +++ b/NCPPlugin/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java @@ -577,12 +577,7 @@ public class MovingListener extends CheckListener implements TickListener, IRemo } // Check NoFall if no reset is done. if (cc.noFallCheck && !NCPExemptionManager.isExempted(player, CheckType.MOVING_NOFALL) && !player.hasPermission(Permissions.MOVING_NOFALL)) { - if (passableTo != null){ - // Deal damage if necessary. - // Leaving out: player.getLocation().getY() - if (cc.sfFallDamage) noFall.checkDamage(player, data, Math.min(from.getY(), to.getY())); - } - else if (newTo == null) { + if (newTo == null && passableTo == null){ // NOTE: noFall might set yOnGround for the positions. noFall.check(player, pFrom, pTo, data, cc); }