Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-24 18:07:39 +01:00
Code Issues Projects Releases Wiki Activity

Factor invulnerableTicks into getNoDamageTicks. Fixes BUKKIT-1324

Browse Source
This commit is contained in:
feildmaster 2012-07-04 15:12:29 -05:00
parent d7272f42ef
commit dba9349ed4
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

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