diff options
| author | feildmaster <admin@feildmaster.com> | 2012-12-23 05:49:03 -0600 |
|---|---|---|
| committer | feildmaster <admin@feildmaster.com> | 2012-12-23 07:29:06 -0600 |
| commit | ced06463510e7836de72e259bcd17e8ab1629877 (patch) | |
| tree | 4c694e6ccf866b9acb45ca3a8ea8302e4c13894a /src/main/java/net/minecraft/server/EntityHuman.java | |
| parent | 4e1793f363fad0ecb8c519526f1b93d8fd53377d (diff) | |
| download | craftbukkit-ced06463510e7836de72e259bcd17e8ab1629877.tar craftbukkit-ced06463510e7836de72e259bcd17e8ab1629877.tar.gz craftbukkit-ced06463510e7836de72e259bcd17e8ab1629877.tar.lz craftbukkit-ced06463510e7836de72e259bcd17e8ab1629877.tar.xz craftbukkit-ced06463510e7836de72e259bcd17e8ab1629877.zip | |
Implement entity max health methods. Adds BUKKIT-266
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityHuman.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityHuman.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java index 3aec4df3..85663915 100644 --- a/src/main/java/net/minecraft/server/EntityHuman.java +++ b/src/main/java/net/minecraft/server/EntityHuman.java @@ -294,7 +294,8 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen --this.bN; } - if (this.world.difficulty == 0 && this.getHealth() < this.getMaxHealth() && this.ticksLived % 20 * 12 == 0) { + // CraftBukkit - this.getMaxHealth() -> this.maxHealth + if (this.world.difficulty == 0 && this.getHealth() < this.maxHealth && this.ticksLived % 20 * 12 == 0) { // CraftBukkit - added regain reason of "REGEN" for filtering purposes. this.heal(1, org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason.REGEN); } @@ -1289,7 +1290,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen } public boolean cd() { - return this.getHealth() > 0 && this.getHealth() < this.getMaxHealth(); + return this.getHealth() > 0 && this.getHealth() < this.maxHealth; // CraftBukkit - this.getMaxHealth() -> this.maxHealth } public void a(ItemStack itemstack, int i) { |