OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-25 01:25:03 +01:00
Code Issues Projects Releases Packages Wiki Activity

SPIGOT-1613: Fix missed use of scaled health

Browse source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2016-03-06 08:38:01 +11:00
parent 819131cad1
commit 6d76250ec1
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
paper-server/nms-patches/EntityPlayer.patch
View file

@ -103,6 +103,15 @@
this.playerInteractManager.a(); this.playerInteractManager.a();
--this.invulnerableTicks; --this.invulnerableTicks;
if (this.noDamageTicks > 0) { 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 @@ @@ -213,6 +272,12 @@
this.a(IScoreboardCriteria.i, MathHelper.f((float) this.bW)); this.a(IScoreboardCriteria.i, MathHelper.f((float) this.bW));
} }