From 22adf8a3ce1a9482f44d9f1147e8b35535d3a2ff Mon Sep 17 00:00:00 2001 From: Wesley Wolfe Date: Tue, 2 Jul 2013 12:34:40 -0500 Subject: Rework max health values. Fixes BUKKIT-4398 --- src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/main/java/org') diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java index bd00911b..da7a2af9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -19,6 +19,7 @@ import net.minecraft.server.EntitySnowball; import net.minecraft.server.EntityPlayer; import net.minecraft.server.EntityPotion; import net.minecraft.server.EntityWitherSkull; +import net.minecraft.server.GenericAttributes; import net.minecraft.server.MobEffect; import net.minecraft.server.MobEffectList; import net.minecraft.server.Packet42RemoveMobEffect; @@ -83,13 +84,13 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { } public double getMaxHealth() { - return getHandle().maxHealth; + return getHandle().getMaxHealth(); } public void setMaxHealth(double amount) { Validate.isTrue(amount > 0, "Max health must be greater than 0"); - getHandle().maxHealth = (float) amount; + getHandle().a(GenericAttributes.a).a(amount); if (getHealth() > amount) { setHealth(amount); -- cgit v1.2.3