From 2a6be42be03bb6d1e9b066b79f9384d7d063c23e Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Fri, 17 Nov 2017 11:08:26 +1100 Subject: [PATCH] Use generics in health scaling methods By: md_5 --- .../java/org/bukkit/craftbukkit/entity/CraftPlayer.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 3cfe5ac44..9747a8866 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java @@ -1332,7 +1332,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player { public void updateScaledHealth() { AttributeMapServer attributemapserver = (AttributeMapServer) getHandle().getAttributeMap(); - Collection set = attributemapserver.c(); // PAIL: Rename + Collection set = attributemapserver.c(); // PAIL: Rename injectScaledMaxHealth(set, true); @@ -1347,13 +1347,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player { getHandle().playerConnection.sendPacket(new PacketPlayOutUpdateHealth(getScaledHealth(), getHandle().getFoodData().getFoodLevel(), getHandle().getFoodData().getSaturationLevel())); } - public void injectScaledMaxHealth(Collection collection, boolean force) { + public void injectScaledMaxHealth(Collection collection, boolean force) { if (!scaledHealth && !force) { return; } - for (Object genericInstance : collection) { - IAttribute attribute = ((AttributeInstance) genericInstance).getAttribute(); - if (attribute.getName().equals("generic.maxHealth")) { + for (AttributeInstance genericInstance : collection) { + if (genericInstance.getAttribute().getName().equals("generic.maxHealth")) { collection.remove(genericInstance); break; }