Update to Minecraft 1.3 beta

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();