Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-22 08:57:35 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-1811: Death message not shown on respawn screen

Browse Source
This commit is contained in:
md_5 2018-12-27 11:37:19 +11:00
parent b4a4f15dbf
commit 79ded7a8ca
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nms-patches/EntityLiving.patch
View File

@ -368,7 +368,7 @@
+ player.setRealHealth(f); + player.setRealHealth(f);
+ } + }
+ +
+ player.updateScaledHealth(); + player.updateScaledHealth(false);
+ return; + return;
+ } + }
+ // CraftBukkit end + // CraftBukkit end

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

@ -1467,6 +1467,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
} }
public void updateScaledHealth() { public void updateScaledHealth() {
updateScaledHealth(true);
}
public void updateScaledHealth(boolean sendHealth) {
AttributeMapServer attributemapserver = (AttributeMapServer) getHandle().getAttributeMap(); AttributeMapServer attributemapserver = (AttributeMapServer) getHandle().getAttributeMap();
Collection<AttributeInstance> set = attributemapserver.c(); // PAIL: Rename Collection<AttributeInstance> set = attributemapserver.c(); // PAIL: Rename
@ -1475,7 +1479,9 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// SPIGOT-3813: Attributes before health // SPIGOT-3813: Attributes before health
if (getHandle().playerConnection != null) { if (getHandle().playerConnection != null) {
getHandle().playerConnection.sendPacket(new PacketPlayOutUpdateAttributes(getHandle().getId(), set)); getHandle().playerConnection.sendPacket(new PacketPlayOutUpdateAttributes(getHandle().getId(), set));
sendHealthUpdate(); if (sendHealth) {
sendHealthUpdate();
}
} }
getHandle().getDataWatcher().set(EntityLiving.HEALTH, (float) getScaledHealth()); getHandle().getDataWatcher().set(EntityLiving.HEALTH, (float) getScaledHealth());