diff options
| author | Wesley Wolfe <weswolf@aol.com> | 2013-07-23 22:07:42 -0500 |
|---|---|---|
| committer | Wesley Wolfe <weswolf@aol.com> | 2013-07-23 22:07:42 -0500 |
| commit | 0a9758ae548c03938be2e3e41cdd6f0fc1db8183 (patch) | |
| tree | b96932783de8f6e5591ac10d208d6a4b7f878470 /src/main | |
| parent | e88cea8402eb1ab94249c10e298c43875ac8b17f (diff) | |
| download | craftbukkit-0a9758ae548c03938be2e3e41cdd6f0fc1db8183.tar craftbukkit-0a9758ae548c03938be2e3e41cdd6f0fc1db8183.tar.gz craftbukkit-0a9758ae548c03938be2e3e41cdd6f0fc1db8183.tar.lz craftbukkit-0a9758ae548c03938be2e3e41cdd6f0fc1db8183.tar.xz craftbukkit-0a9758ae548c03938be2e3e41cdd6f0fc1db8183.zip | |
Fix CraftBukkit diffs
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityLiving.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java index c7012c51..ea799195 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -82,7 +82,7 @@ public abstract class EntityLiving extends Entity { public EntityLiving(World world) { super(world); this.ay(); - // CraftBukkit - setHealth(getMaxHealth()) -> current - inlined to skip the instanceof check for EntityPlayers + // CraftBukkit - setHealth(getMaxHealth()) inlined and simplified to skip the instanceof check for EntityPlayer, as getBukkitEntity() is not initialized in constructor this.datawatcher.watch(6, (float) this.getAttributeInstance(GenericAttributes.a).getValue()); this.m = true; this.aM = (float) (Math.random() + 1.0D) * 0.01F; @@ -584,7 +584,7 @@ public abstract class EntityLiving extends Entity { } public final float getHealth() { - // CraftBukkit start - Scaled Health + // CraftBukkit start - Use unscaled health if (this instanceof EntityPlayer) { return (float) ((EntityPlayer) this).getBukkitEntity().getHealth(); } @@ -593,7 +593,7 @@ public abstract class EntityLiving extends Entity { } public void setHealth(float f) { - // CraftBukkit start - Scaled Health + // CraftBukkit start - Handle scaled health if (this instanceof EntityPlayer) { org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity(); // Squeeze |