diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-02-23 02:37:56 +0000 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-02-23 02:37:56 +0000 |
commit | f759e0b60d3a575d31921c930e436af321b0e7e8 (patch) | |
tree | 4b1eb7ac01670854c686b1f6faa2f97ff337f7d7 /src/main/java/net/minecraft/server/EntityMonster.java | |
parent | a124bfdab59cc9a9d8369425027e61eccd1d62fb (diff) | |
download | craftbukkit-f759e0b60d3a575d31921c930e436af321b0e7e8.tar craftbukkit-f759e0b60d3a575d31921c930e436af321b0e7e8.tar.gz craftbukkit-f759e0b60d3a575d31921c930e436af321b0e7e8.tar.lz craftbukkit-f759e0b60d3a575d31921c930e436af321b0e7e8.tar.xz craftbukkit-f759e0b60d3a575d31921c930e436af321b0e7e8.zip |
Update to Minecraft 1.3 beta
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityMonster.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityMonster.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java index 8d22b917..71e32fb8 100644 --- a/src/main/java/net/minecraft/server/EntityMonster.java +++ b/src/main/java/net/minecraft/server/EntityMonster.java @@ -20,27 +20,27 @@ public class EntityMonster extends EntityCreature implements IMonster { this.health = 20; } - public void o() { - float f = this.b(1.0F); + public void q() { + float f = this.c(1.0F); if (f > 0.5F) { - this.bw += 2; + this.at += 2; } - super.o(); + super.q(); } - public void b_() { - super.b_(); - if (this.world.k == 0) { - this.q(); + public void f_() { + super.f_(); + if (this.world.j == 0) { + this.C(); } } protected Entity l() { EntityHuman entityhuman = this.world.a(this, 16.0D); - return entityhuman != null && this.i(entityhuman) ? entityhuman : null; + return entityhuman != null && this.e(entityhuman) ? entityhuman : null; } public boolean a(Entity entity, int i) { @@ -57,9 +57,9 @@ public class EntityMonster extends EntityCreature implements IMonster { server.getPluginManager().callEvent(event); if (!event.isCancelled()) { if (event.getTarget() == null) { - d = null; + this.d = null; } else { - d = ((CraftEntity) event.getTarget()).getHandle(); + this.d = ((CraftEntity) event.getTarget()).getHandle(); } } // CraftBukkit end @@ -75,10 +75,10 @@ public class EntityMonster extends EntityCreature implements IMonster { } protected void a(Entity entity, float f) { - if ((double) f < 2.5D && entity.boundingBox.e > this.boundingBox.b && entity.boundingBox.b < this.boundingBox.e) { + if ((double) f < 1.5D && entity.boundingBox.e > this.boundingBox.b && entity.boundingBox.b < this.boundingBox.e) { this.attackTicks = 20; // CraftBukkit start - if(entity instanceof EntityLiving) { + if (entity instanceof EntityLiving) { CraftServer server = ((WorldServer) this.world).getServer(); org.bukkit.entity.Entity damager = this.getBukkitEntity(); org.bukkit.entity.Entity damagee = (entity == null) ? null : entity.getBukkitEntity(); |