Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-09-19 18:31:18 +02:00
Code Issues Projects Releases Wiki Activity

SPIGOT-3813: Player.setHealth not reliable in conjunction with attribute API

Browse Source
This commit is contained in:
md_5 2018-02-12 08:59:32 +11:00
parent 49ecc7c7a2
commit 8bb4f6ccc1
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nms-patches/EntityLiving.patch
View File

@ -257,7 +257,7 @@
+ player.setRealHealth(f);
+ }
+
+ this.datawatcher.set(EntityLiving.HEALTH, Float.valueOf(player.getScaledHealth()));
+ player.updateScaledHealth();
+ return;
+ }
+ // CraftBukkit end

7
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@ -1382,9 +1382,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
injectScaledMaxHealth(set, true);
// SPIGOT-3813: Attributes before health
if (getHandle().playerConnection != null) {
getHandle().playerConnection.sendPacket(new PacketPlayOutUpdateAttributes(getHandle().getId(), set));
sendHealthUpdate();
}
getHandle().getDataWatcher().set(EntityLiving.HEALTH, (float) getScaledHealth());
sendHealthUpdate();
getHandle().playerConnection.sendPacket(new PacketPlayOutUpdateAttributes(getHandle().getId(), set));
getHandle().maxHealthCache = getMaxHealth();
}