OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-06 02:35:49 +01:00
Code Issues Projects Releases Packages 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() { public void updateScaledHealth() {
AttributeMapServer attributemapserver = (AttributeMapServer) getHandle().getAttributeMap(); AttributeMapServer attributemapserver = (AttributeMapServer) getHandle().getAttributeMap();
Collection set = attributemapserver.c(); // PAIL: Rename Collection<AttributeInstance> set = attributemapserver.c(); // PAIL: Rename
injectScaledMaxHealth(set, true); 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())); 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) { if (!scaledHealth && !force) {
return; return;
} }
for (Object genericInstance : collection) { for (AttributeInstance genericInstance : collection) {
IAttribute attribute = ((AttributeInstance) genericInstance).getAttribute(); if (genericInstance.getAttribute().getName().equals("generic.maxHealth")) {
if (attribute.getName().equals("generic.maxHealth")) {
collection.remove(genericInstance); collection.remove(genericInstance);
break; break;
} }