Shuffle checks in fight listener

This commit is contained in:
asofold 2013-07-11 01:51:36 +02:00
parent 7c77764697
commit 6f232e5dde

View File

@ -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;