diff options
| author | Wesley Wolfe <weswolf@aol.com> | 2013-07-02 23:08:55 -0500 |
|---|---|---|
| committer | Wesley Wolfe <weswolf@aol.com> | 2013-07-02 23:09:43 -0500 |
| commit | adcb293a036c88a4977f05bb5ff4e0d91b8ec9d1 (patch) | |
| tree | 8ace7f0e6f5c8a0bd04560b0dc95213c2350b7f1 /src/main/java/net/minecraft | |
| parent | e1a3fb56b5f6df7cde5a8c5933d017aa9d8de07c (diff) | |
| download | craftbukkit-adcb293a036c88a4977f05bb5ff4e0d91b8ec9d1.tar craftbukkit-adcb293a036c88a4977f05bb5ff4e0d91b8ec9d1.tar.gz craftbukkit-adcb293a036c88a4977f05bb5ff4e0d91b8ec9d1.tar.lz craftbukkit-adcb293a036c88a4977f05bb5ff4e0d91b8ec9d1.tar.xz craftbukkit-adcb293a036c88a4977f05bb5ff4e0d91b8ec9d1.zip | |
Fix scaling for player health. Fixes BUKKIT-4431
Diffstat (limited to 'src/main/java/net/minecraft')
| -rw-r--r-- | src/main/java/net/minecraft/server/EntityPlayer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index 69a76792..b38aa108 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -233,8 +233,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting { } if (this.getHealth() != this.bP || this.bQ != this.foodData.a() || this.foodData.e() == 0.0F != this.bR) { - // CraftBukkit - this.getHealth() -> this.getScaledHealth() - Magic number 20 -> original max health - this.playerConnection.sendPacket(new Packet8UpdateHealth((float) (this.getHealth() * this.getMaxHealth() / 20.0D), this.foodData.a(), this.foodData.e())); + // CraftBukkit - Optionally scale health + this.playerConnection.sendPacket(new Packet8UpdateHealth(getBukkitEntity().getScaledHealth(), this.foodData.a(), this.foodData.e())); this.bP = this.getHealth(); this.bQ = this.foodData.a(); this.bR = this.foodData.e() == 0.0F; |