diff options
| author | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-01 10:49:23 +0000 |
|---|---|---|
| committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2012-03-01 14:38:31 +0000 |
| commit | 543c4879fee3b7165764c5371d226c93fe3a657b (patch) | |
| tree | 4fe9116464e1fe42a40dc3ba19b58234bd26f821 /src/main/java/net/minecraft/server/MobEffectList.java | |
| parent | e9ca87000c1794715bc3fe0a7d1caaf809057635 (diff) | |
| download | craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.gz craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.lz craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.tar.xz craftbukkit-543c4879fee3b7165764c5371d226c93fe3a657b.zip | |
Updated CraftBukkit to 1.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 56282e95..d0cf8e82 100644 --- a/src/main/java/net/minecraft/server/MobEffectList.java +++ b/src/main/java/net/minecraft/server/MobEffectList.java @@ -95,8 +95,8 @@ public class MobEffectList { } } else if (this.id == HUNGER.id && entityliving instanceof EntityHuman) { ((EntityHuman) entityliving).c(0.025F * (float) (i + 1)); - } else if ((this.id != HEAL.id || entityliving.aE()) && (this.id != HARM.id || !entityliving.aE())) { - if (this.id == HARM.id && !entityliving.aE() || this.id == HEAL.id && entityliving.aE()) { + } else if ((this.id != HEAL.id || entityliving.aM()) && (this.id != HARM.id || !entityliving.aM())) { + if (this.id == HARM.id && !entityliving.aM() || this.id == HEAL.id && entityliving.aM()) { // CraftBukkit start EntityDamageEvent event = CraftEventFactory.callEntityDamageEvent(null, entityliving, DamageCause.MAGIC, 6 << i); Bukkit.getPluginManager().callEvent(event); @@ -120,8 +120,8 @@ public class MobEffectList { // CraftBukkit end int j; - if ((this.id != HEAL.id || entityliving1.aE()) && (this.id != HARM.id || !entityliving1.aE())) { - if (this.id == HARM.id && !entityliving1.aE() || this.id == HEAL.id && entityliving1.aE()) { + if ((this.id != HEAL.id || entityliving1.aM()) && (this.id != HARM.id || !entityliving1.aM())) { + if (this.id == HARM.id && !entityliving1.aM() || this.id == HEAL.id && entityliving1.aM()) { j = (int) (d0 * (double) (6 << i) + 0.5D); // CraftBukkit start |