From 80f58d94ced076443bdf3c6b3be789e390199c57 Mon Sep 17 00:00:00 2001 From: asofold Date: Mon, 15 Jul 2013 23:59:51 +0200 Subject: [PATCH] Also check for player.isFlying. --- .../neatmonster/nocheatplus/checks/moving/MovingListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java index f608ecc3..ed80ebb4 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/moving/MovingListener.java @@ -109,7 +109,7 @@ public class MovingListener extends CheckListener implements TickListener, IRemo public static final boolean shouldCheckSurvivalFly(final Player player, final MovingData data, final MovingConfig cc){ if (player.hasPermission(Permissions.MOVING_CREATIVEFLY)) return false; else if (!cc.survivalFlyCheck || NCPExemptionManager.isExempted(player, CheckType.MOVING_SURVIVALFLY) || player.hasPermission(Permissions.MOVING_SURVIVALFLY)) return false; - else if ((cc.ignoreCreative || player.getGameMode() != GameMode.CREATIVE) && (cc.ignoreAllowFlight || !player.getAllowFlight())){ + else if ((cc.ignoreCreative || player.getGameMode() != GameMode.CREATIVE) && !player.isFlying() && (cc.ignoreAllowFlight || !player.getAllowFlight())){ return true; } else return false; @@ -583,7 +583,7 @@ public class MovingListener extends CheckListener implements TickListener, IRemo checkCf = checkSf = false; } else{ - if ((cc.ignoreCreative || player.getGameMode() != GameMode.CREATIVE) && (cc.ignoreAllowFlight || !player.getAllowFlight()) + if ((cc.ignoreCreative || player.getGameMode() != GameMode.CREATIVE) && !player.isFlying() && (cc.ignoreAllowFlight || !player.getAllowFlight()) && cc.survivalFlyCheck && !NCPExemptionManager.isExempted(player, CheckType.MOVING_SURVIVALFLY) && !player.hasPermission(Permissions.MOVING_SURVIVALFLY)){ checkCf = false; checkSf = true;