summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authormbax <matt@phozop.net>2013-07-08 19:43:37 -0400
committermbax <matt@phozop.net>2013-07-08 19:43:37 -0400
commitf6a0b1e4265544eaee4e4d4adb660812b01d6a06 (patch)
tree84b161b5b99aa45602889987e03b74ad4a9a8e08 /src/main/java/org
parent2d9a9d8cea904deb7f748a0bbdd76a10012b3821 (diff)
downloadcraftbukkit-f6a0b1e4265544eaee4e4d4adb660812b01d6a06.tar
craftbukkit-f6a0b1e4265544eaee4e4d4adb660812b01d6a06.tar.gz
craftbukkit-f6a0b1e4265544eaee4e4d4adb660812b01d6a06.tar.lz
craftbukkit-f6a0b1e4265544eaee4e4d4adb660812b01d6a06.tar.xz
craftbukkit-f6a0b1e4265544eaee4e4d4adb660812b01d6a06.zip
Update CraftBukkit to 1.6.2
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java2
-rw-r--r--src/main/java/org/bukkit/craftbukkit/potion/CraftPotionEffectType.java6
2 files changed, 7 insertions, 1 deletions
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;
}