From ac251f0cf9767e97ebdf1664c26cc9a565298843 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 6 Mar 2016 08:38:01 +1100 Subject: [PATCH] SPIGOT-1613: Fix missed use of scaled health --- nms-patches/EntityPlayer.patch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nms-patches/EntityPlayer.patch b/nms-patches/EntityPlayer.patch index a2a0b344a2..71a2a74726 100644 --- a/nms-patches/EntityPlayer.patch +++ b/nms-patches/EntityPlayer.patch @@ -103,6 +103,15 @@ this.playerInteractManager.a(); --this.invulnerableTicks; if (this.noDamageTicks > 0) { +@@ -192,7 +251,7 @@ + } + + if (this.getHealth() != this.lastHealthSent || this.cb != this.foodData.getFoodLevel() || this.foodData.getSaturationLevel() == 0.0F != this.cc) { +- this.playerConnection.sendPacket(new PacketPlayOutUpdateHealth(this.getHealth(), this.foodData.getFoodLevel(), this.foodData.getSaturationLevel())); ++ this.playerConnection.sendPacket(new PacketPlayOutUpdateHealth(this.getBukkitEntity().getScaledHealth(), this.foodData.getFoodLevel(), this.foodData.getSaturationLevel())); // CraftBukkit + this.lastHealthSent = this.getHealth(); + this.cb = this.foodData.getFoodLevel(); + this.cc = this.foodData.getSaturationLevel() == 0.0F; @@ -213,6 +272,12 @@ this.a(IScoreboardCriteria.i, MathHelper.f((float) this.bW)); }