diff options
author | feildmaster <admin@feildmaster.com> | 2012-12-19 22:03:52 -0600 |
---|---|---|
committer | feildmaster <admin@feildmaster.com> | 2012-12-20 10:43:00 -0600 |
commit | 23b67643741d5754af4de020a29d557078f9f81d (patch) | |
tree | 90e1a32f7eb94af49a381cb6bc34bf6247f0efe6 /src/main/java/net/minecraft/server/EntityEnderman.java | |
parent | 9f1bf124eec7c20f16b2034fd9fba55f70c805fd (diff) | |
download | craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar.gz craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar.lz craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.tar.xz craftbukkit-23b67643741d5754af4de020a29d557078f9f81d.zip |
Update CraftBukkit to Minecraft 1.4.6
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityEnderman.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityEnderman.java | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java index eb331932..15b5516b 100644 --- a/src/main/java/net/minecraft/server/EntityEnderman.java +++ b/src/main/java/net/minecraft/server/EntityEnderman.java @@ -15,7 +15,7 @@ public class EntityEnderman extends EntityMonster { public EntityEnderman(World world) { super(world); this.texture = "/mob/enderman.png"; - this.bG = 0.2F; + this.bH = 0.2F; this.a(0.6F, 2.9F); this.X = 1.0F; } @@ -87,7 +87,7 @@ public class EntityEnderman extends EntityMonster { this.damageEntity(DamageSource.DROWN, 1); } - this.bG = this.target != null ? 6.5F : 0.3F; + this.bH = this.target != null ? 6.5F : 0.3F; int i; if (!this.world.isStatic && this.world.getGameRules().getBoolean("mobGriefing")) { @@ -143,13 +143,13 @@ public class EntityEnderman extends EntityMonster { } } - if (this.G()) { + if (this.G() || this.isBurning()) { this.target = null; this.f(false); this.m(); } - this.bE = false; + this.bF = false; if (this.target != null) { this.a(this.target, 100.0F, 100.0F); } @@ -157,8 +157,8 @@ public class EntityEnderman extends EntityMonster { if (!this.world.isStatic && this.isAlive()) { if (this.target != null) { if (this.target instanceof EntityHuman && this.d((EntityHuman) this.target)) { - this.bB = this.bC = 0.0F; - this.bG = 0.0F; + this.bC = this.bD = 0.0F; + this.bH = 0.0F; if (this.target.e((Entity) this) < 16.0D) { this.m(); } @@ -317,20 +317,19 @@ public class EntityEnderman extends EntityMonster { public boolean damageEntity(DamageSource damagesource, int i) { if (this.isInvulnerable()) { return false; - } else if (damagesource instanceof EntityDamageSourceIndirect) { - for (int j = 0; j < 64; ++j) { - if (this.m()) { - return true; + } else { + this.f(true); + if (damagesource instanceof EntityDamageSourceIndirect) { + for (int j = 0; j < 64; ++j) { + if (this.m()) { + return true; + } } - } - return false; - } else { - if (damagesource.getEntity() instanceof EntityHuman) { - this.f(true); + return false; + } else { + return super.damageEntity(damagesource, i); } - - return super.damageEntity(damagesource, i); } } |