diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-05-26 13:48:22 +0100 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-05-26 13:48:22 +0100 |
commit | 6903f2024217f0959c015e76b23297af8e3b573f (patch) | |
tree | 690bf275ce19c655bd64eea05be231ed0c318fd6 /src/main/java/net/minecraft/server/EntityMonster.java | |
parent | f463453d73249fe73cf3e23ed37e6cee870c8bf4 (diff) | |
download | craftbukkit-6903f2024217f0959c015e76b23297af8e3b573f.tar craftbukkit-6903f2024217f0959c015e76b23297af8e3b573f.tar.gz craftbukkit-6903f2024217f0959c015e76b23297af8e3b573f.tar.lz craftbukkit-6903f2024217f0959c015e76b23297af8e3b573f.tar.xz craftbukkit-6903f2024217f0959c015e76b23297af8e3b573f.zip |
Implemented 1.6!
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityMonster.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityMonster.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java index bc8be4d2..a4ac63d3 100644 --- a/src/main/java/net/minecraft/server/EntityMonster.java +++ b/src/main/java/net/minecraft/server/EntityMonster.java @@ -24,7 +24,7 @@ public class EntityMonster extends EntityCreature implements IMonster { float f = this.c(1.0F); if (f > 0.5F) { - this.au += 2; + this.ax += 2; } super.u(); @@ -32,7 +32,7 @@ public class EntityMonster extends EntityCreature implements IMonster { public void p_() { super.p_(); - if (this.world.spawnMonsters == 0) { + if (!this.world.isStatic && this.world.spawnMonsters == 0) { this.die(); } } @@ -79,9 +79,9 @@ public class EntityMonster extends EntityCreature implements IMonster { protected void a(Entity entity, float f) { if (this.attackTicks <= 0 && f < 2.0F && entity.boundingBox.e > this.boundingBox.b && entity.boundingBox.b < this.boundingBox.e) { this.attackTicks = 20; - // CraftBukkit start - this is still duplicated here and EntityHuman because it's possible for an EntityMonster + // CraftBukkit start - this is still duplicated here and EntityHuman because it's possible for lastDamage EntityMonster // to damage another EntityMonster, and we want to catch those events. - // This does not fire events for slime attacks, as they're not an EntityMonster. + // This does not fire events for slime attacks, av they're not lastDamage EntityMonster. if (entity instanceof EntityLiving && !(entity instanceof EntityHuman)) { CraftServer server = ((WorldServer) this.world).getServer(); org.bukkit.entity.Entity damager = this.getBukkitEntity(); @@ -103,7 +103,7 @@ public class EntityMonster extends EntityCreature implements IMonster { } protected float a(int i, int j, int k) { - return 0.5F - this.world.l(i, j, k); + return 0.5F - this.world.m(i, j, k); } public void b(NBTTagCompound nbttagcompound) { |