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 index 404878ce..320b3f20 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FightListener.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FightListener.java @@ -195,22 +195,24 @@ public class FightListener extends CheckListener implements JoinLeaveListener{ if (!cancelled && critical.isEnabled(player) && critical.check(player)) cancelled = true; - - if (!cancelled && direction.isEnabled(player) && direction.check(player, damaged)) - cancelled = true; - + if (!cancelled && knockback.isEnabled(player) && knockback.check(player)) cancelled = true; - + if (!cancelled && noSwing.isEnabled(player) && noSwing.check(player)) cancelled = true; - - if (!cancelled && reach.isEnabled(player) && reach.check(player, damaged)) - cancelled = true; - + if (!cancelled && player.isBlocking() && !player.hasPermission(Permissions.MOVING_SURVIVALFLY_BLOCKING)) cancelled = true; + // TODO: Order of the last two [might put first] ? + + if (!cancelled && reach.isEnabled(player) && reach.check(player, damaged)) + cancelled = true; + + if (!cancelled && direction.isEnabled(player) && direction.check(player, damaged)) + cancelled = true; + // Set values. data.lastWorld = worldName; data.lastAttackTick = tick;