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

Use generics in health scaling methods

Browse Source
This commit is contained in:
md_5 2017-11-17 11:08:26 +11:00
parent b4c298d644
commit c15d869440
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<AttributeInstance> 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<AttributeInstance> 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;
}