Re-order conditions.

This commit is contained in:
asofold 2013-03-16 04:33:47 +01:00
parent ab99e871f9
commit 171f2aa932

View File

@ -151,7 +151,7 @@ public class FightListener extends CheckListener implements JoinLeaveListener{
}
}
if (data.thornsId == damaged.getEntityId() && damage <= 4 && tick == data.damageTakenByEntityTick){
if (damage <= 4 && tick == data.damageTakenByEntityTick && data.thornsId != Integer.MIN_VALUE && data.thornsId == damaged.getEntityId()){
// Don't handle further, but do respect selfhit/canceldead.
data.thornsId = Integer.MIN_VALUE;
System.out.println("*** SKIP THORNS: " + player.getName());