diff options
| author | mbax <matt@phozop.net> | 2013-07-08 19:43:37 -0400 |
|---|---|---|
| committer | mbax <matt@phozop.net> | 2013-07-08 19:43:37 -0400 |
| commit | f6a0b1e4265544eaee4e4d4adb660812b01d6a06 (patch) | |
| tree | 84b161b5b99aa45602889987e03b74ad4a9a8e08 /src/main/java/net/minecraft/server/MobEffectList.java | |
| parent | 2d9a9d8cea904deb7f748a0bbdd76a10012b3821 (diff) | |
| download | craftbukkit-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/net/minecraft/server/MobEffectList.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/MobEffectList.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/MobEffectList.java b/src/main/java/net/minecraft/server/MobEffectList.java index dd018fdd..1f4d1a3d 100644 --- a/src/main/java/net/minecraft/server/MobEffectList.java +++ b/src/main/java/net/minecraft/server/MobEffectList.java @@ -96,8 +96,8 @@ public class MobEffectList { if (!entityliving.world.isStatic) { ((EntityHuman) entityliving).getFoodData().eat(i + 1, 1.0F); } - } else if ((this.id != HEAL.id || entityliving.aI()) && (this.id != HARM.id || !entityliving.aI())) { - if (this.id == HARM.id && !entityliving.aI() || this.id == HEAL.id && entityliving.aI()) { + } else if ((this.id != HEAL.id || entityliving.aL()) && (this.id != HARM.id || !entityliving.aL())) { + if (this.id == HARM.id && !entityliving.aL() || this.id == HEAL.id && entityliving.aL()) { entityliving.damageEntity(DamageSource.MAGIC, (float) (6 << i)); } } else { @@ -114,8 +114,8 @@ public class MobEffectList { // CraftBukkit end int j; - if ((this.id != HEAL.id || entityliving1.aI()) && (this.id != HARM.id || !entityliving1.aI())) { - if (this.id == HARM.id && !entityliving1.aI() || this.id == HEAL.id && entityliving1.aI()) { + if ((this.id != HEAL.id || entityliving1.aL()) && (this.id != HARM.id || !entityliving1.aL())) { + if (this.id == HARM.id && !entityliving1.aL() || this.id == HEAL.id && entityliving1.aL()) { j = (int) (d0 * (double) (6 << i) + 0.5D); if (entityliving == null) { entityliving1.damageEntity(DamageSource.MAGIC, (float) j); |