From 442b7a69f1130d0114226d30d081cfe6dc6d8e0a Mon Sep 17 00:00:00 2001 From: EvilSeph Date: Sun, 28 Oct 2012 23:55:40 -0400 Subject: [PATCH] Prevent health from wrapping around. --- src/main/java/net/minecraft/server/EntityLiving.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java index 884a797f3..d6a4c1690 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -1055,6 +1055,12 @@ public abstract class EntityLiving extends Entity { } public void b(NBTTagCompound nbttagcompound) { + // CraftBukkit start + if (this.health < -32768) { + this.health = -32768; + } + // CraftBukkit end + nbttagcompound.setShort("Health", (short) this.health); nbttagcompound.setShort("HurtTime", (short) this.hurtTicks); nbttagcompound.setShort("DeathTime", (short) this.deathTicks); @@ -1100,10 +1106,6 @@ public abstract class EntityLiving extends Entity { } public void a(NBTTagCompound nbttagcompound) { - if (this.health < -32768) { - this.health = -32768; - } - this.health = nbttagcompound.getShort("Health"); if (!nbttagcompound.hasKey("Health")) { this.health = this.getMaxHealth();