From f6a0b1e4265544eaee4e4d4adb660812b01d6a06 Mon Sep 17 00:00:00 2001 From: mbax Date: Mon, 8 Jul 2013 19:43:37 -0400 Subject: Update CraftBukkit to 1.6.2 --- src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java | 2 +- .../java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (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 1d52866e..3db1b223 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -90,7 +90,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { public void setMaxHealth(double amount) { Validate.isTrue(amount > 0, "Max health must be greater than 0"); - getHandle().a(GenericAttributes.a).a(amount); + getHandle().getAttributeInstance(GenericAttributes.a).setValue(amount); if (getHealth() > amount) { setHealth(amount); diff --git a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java index 900dc7d2..b59d142a 100644 --- a/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java +++ b/src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java @@ -64,6 +64,12 @@ public class CraftPotionEffectType extends PotionEffectType { return "POISON"; case 20: return "WITHER"; + case 21: + return "HEALTH_BOOST"; + case 22: + return "ABSORPTION"; + case 23: + return "SATURATION"; default: return "UNKNOWN_EFFECT_TYPE_" + handle.id; } -- cgit v1.2.3