summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThinkofname <thinkofdeath@spigotmc.org>2016-03-25 23:13:16 +0000
committerThinkofname <thinkofdeath@spigotmc.org>2016-03-25 23:13:16 +0000
commit95548945533d8572a7cb911b33c8ef4a823be49b (patch)
treed97165dd8e0987ae46d7b3a05200de41e4e1956c /src
parent99f22a5c59dac803c7002ea176520c9cd91b8c35 (diff)
downloadcraftbukkit-95548945533d8572a7cb911b33c8ef4a823be49b.tar
craftbukkit-95548945533d8572a7cb911b33c8ef4a823be49b.tar.gz
craftbukkit-95548945533d8572a7cb911b33c8ef4a823be49b.tar.lz
craftbukkit-95548945533d8572a7cb911b33c8ef4a823be49b.tar.xz
craftbukkit-95548945533d8572a7cb911b33c8ef4a823be49b.zip
SPIGOT-2049: Send the right attributes when updating scaled health
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index 303da2d0..cf307e59 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1281,7 +1281,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public void updateScaledHealth() {
AttributeMapServer attributemapserver = (AttributeMapServer) getHandle().getAttributeMap();
- Set set = attributemapserver.getAttributes();
+ Collection set = attributemapserver.c(); // PAIL: Rename
injectScaledMaxHealth(set, true);
@@ -1289,7 +1289,6 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
getHandle().playerConnection.sendPacket(new PacketPlayOutUpdateHealth(getScaledHealth(), getHandle().getFoodData().getFoodLevel(), getHandle().getFoodData().getSaturationLevel()));
getHandle().playerConnection.sendPacket(new PacketPlayOutUpdateAttributes(getHandle().getId(), set));
- set.clear();
getHandle().maxHealthCache = getMaxHealth();
}