From 385ace970ee7b7912419d601b8a0867c4c2794df Mon Sep 17 00:00:00 2001
From: Nate Mortensen <nate.richard.mortensen@gmail.com>
Date: Thu, 20 Mar 2014 22:26:30 -0600
Subject: Update CraftBukkit to Minecraft 1.7.5

---
 .../java/net/minecraft/server/EntityMonster.java   | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/main/java/net/minecraft/server/EntityMonster.java')

diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java
index 88559240..6e02e2a5 100644
--- a/src/main/java/net/minecraft/server/EntityMonster.java
+++ b/src/main/java/net/minecraft/server/EntityMonster.java
@@ -10,11 +10,11 @@ public abstract class EntityMonster extends EntityCreature implements IMonster {
     }
 
     public void e() {
-        this.bb();
+        this.ba();
         float f = this.d(1.0F);
 
         if (f > 0.5F) {
-            this.aV += 2;
+            this.aU += 2;
         }
 
         super.e();
@@ -27,18 +27,18 @@ public abstract class EntityMonster extends EntityCreature implements IMonster {
         }
     }
 
-    protected String H() {
+    protected String G() {
         return "game.hostile.swim";
     }
 
-    protected String O() {
+    protected String N() {
         return "game.hostile.swim.splash";
     }
 
     protected Entity findTarget() {
         EntityHuman entityhuman = this.world.findNearbyVulnerablePlayer(this, 16.0D);
 
-        return entityhuman != null && this.o(entityhuman) ? entityhuman : null;
+        return entityhuman != null && this.p(entityhuman) ? entityhuman : null;
     }
 
     public boolean damageEntity(DamageSource damagesource, float f) {
@@ -75,11 +75,11 @@ public abstract class EntityMonster extends EntityCreature implements IMonster {
         }
     }
 
-    protected String aT() {
+    protected String aS() {
         return "game.hostile.hurt";
     }
 
-    protected String aU() {
+    protected String aT() {
         return "game.hostile.die";
     }
 
@@ -87,7 +87,7 @@ public abstract class EntityMonster extends EntityCreature implements IMonster {
         return i > 4 ? "game.hostile.hurt.fall.big" : "game.hostile.hurt.fall.small";
     }
 
-    public boolean m(Entity entity) {
+    public boolean n(Entity entity) {
         float f = (float) this.getAttributeInstance(GenericAttributes.e).getValue();
         int i = 0;
 
@@ -124,7 +124,7 @@ public abstract 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;
-            this.m(entity);
+            this.n(entity);
         }
     }
 
@@ -142,7 +142,7 @@ public abstract class EntityMonster extends EntityCreature implements IMonster {
         } else {
             int l = this.world.getLightLevel(i, j, k);
 
-            if (this.world.O()) {
+            if (this.world.P()) {
                 int i1 = this.world.j;
 
                 this.world.j = 10;
@@ -158,12 +158,12 @@ public abstract class EntityMonster extends EntityCreature implements IMonster {
         return this.world.difficulty != EnumDifficulty.PEACEFUL && this.j_() && super.canSpawn();
     }
 
-    protected void aD() {
-        super.aD();
-        this.bc().b(GenericAttributes.e);
+    protected void aC() {
+        super.aC();
+        this.bb().b(GenericAttributes.e);
     }
 
-    protected boolean aG() {
+    protected boolean aF() {
         return true;
     }
 }
-- 
cgit v1.2.3