Factor invulnerableTicks into getNoDamageTicks. Fixes BUKKIT-1324
By: feildmaster <admin@feildmaster.com>
This commit is contained in:
@@ -850,4 +850,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
|
|||||||
getHandle().abilities.canFly = value;
|
getHandle().abilities.canFly = value;
|
||||||
getHandle().updateAbilities();
|
getHandle().updateAbilities();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int getNoDamageTicks() {
|
||||||
|
if (getHandle().invulnerableTicks > 0) {
|
||||||
|
return Math.max(getHandle().invulnerableTicks, getHandle().noDamageTicks);
|
||||||
|
} else {
|
||||||
|
return getHandle().noDamageTicks;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user