diff options
| author | EvilSeph <evilseph@gmail.com> | 2012-01-27 18:23:16 -0500 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-01-27 18:23:58 -0500 |
| commit | bb730f0ee7da4dd096fa82ad77c159c7c721de89 (patch) | |
| tree | 40cd0256750b9e318bb6e36e5b76d4d6e0399aed /src/main/java | |
| parent | 38ad0ea5fd78404490ba52c7be2241f7b4036dec (diff) | |
| download | craftbukkit-bb730f0ee7da4dd096fa82ad77c159c7c721de89.tar craftbukkit-bb730f0ee7da4dd096fa82ad77c159c7c721de89.tar.gz craftbukkit-bb730f0ee7da4dd096fa82ad77c159c7c721de89.tar.lz craftbukkit-bb730f0ee7da4dd096fa82ad77c159c7c721de89.tar.xz craftbukkit-bb730f0ee7da4dd096fa82ad77c159c7c721de89.zip | |
Cleanup.
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityLiving.java | 1 | ||||
| -rw-r--r-- | src/main/java/net/minecraft/server/EntitySnowman.java | 4 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftServer.java | 2 |
3 files changed, 4 insertions, 3 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 { diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java index e4d8fb4a..5f8216f5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -88,7 +88,7 @@ import org.yaml.snakeyaml.constructor.SafeConstructor; import org.yaml.snakeyaml.error.MarkedYAMLException; public final class CraftServer implements Server { - private final String serverName = "Craftbukkit"; + private final String serverName = "CraftBukkit"; private final String serverVersion; private final String bukkitVersion = Versioning.getBukkitVersion(); private final ServicesManager servicesManager = new SimpleServicesManager(); |