summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft
diff options
context:
space:
mode:
authorEvilSeph <evilseph@gmail.com>2012-01-27 18:23:16 -0500
committerEvilSeph <evilseph@gmail.com>2012-01-27 18:23:58 -0500
commitbb730f0ee7da4dd096fa82ad77c159c7c721de89 (patch)
tree40cd0256750b9e318bb6e36e5b76d4d6e0399aed /src/main/java/net/minecraft
parent38ad0ea5fd78404490ba52c7be2241f7b4036dec (diff)
downloadcraftbukkit-bb730f0ee7da4dd096fa82ad77c159c7c721de89.tar
craftbukkit-bb730f0ee7da4dd096fa82ad77c159c7c721de89.tar.gz
craftbukkit-bb730f0ee7da4dd096fa82ad77c159c7c721de89.tar.lz
craftbukkit-bb730f0ee7da4dd096fa82ad77c159c7c721de89.tar.xz
craftbukkit-bb730f0ee7da4dd096fa82ad77c159c7c721de89.zip
Cleanup.
Diffstat (limited to 'src/main/java/net/minecraft')
-rw-r--r--src/main/java/net/minecraft/server/EntityLiving.java1
-rw-r--r--src/main/java/net/minecraft/server/EntitySnowman.java4
2 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 1c38ac3e..6cf48cb6 100644
--- a/src/main/java/net/minecraft/server/EntityLiving.java
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -823,6 +823,7 @@ public abstract class EntityLiving extends Entity {
}
public void b(NBTTagCompound nbttagcompound) {
+ if (this.health < Short.MIN_VALUE) this.health = Short.MIN_VALUE; // CraftBukkit
nbttagcompound.setShort("Health", (short) this.health);
nbttagcompound.setShort("HurtTime", (short) this.hurtTicks);
nbttagcompound.setShort("DeathTime", (short) this.deathTicks);
diff --git a/src/main/java/net/minecraft/server/EntitySnowman.java b/src/main/java/net/minecraft/server/EntitySnowman.java
index 35373dc3..fbab70a9 100644
--- a/src/main/java/net/minecraft/server/EntitySnowman.java
+++ b/src/main/java/net/minecraft/server/EntitySnowman.java
@@ -1,11 +1,11 @@
package net.minecraft.server;
import java.util.List;
-// Craftbukkit start
+// CraftBukkit start
import org.bukkit.block.BlockState;
import org.bukkit.craftbukkit.event.CraftEventFactory;
import org.bukkit.event.block.EntityBlockFormEvent;
-// Craftbukkit end
+// CraftBukkit end
public class EntitySnowman extends EntityGolem {