1 files changed, 24 insertions, 17 deletions
diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
index 8bb950a9..c57aa010 100644
--- a/src/main/java/net/minecraft/server/EntitySlime.java
+++ b/src/main/java/net/minecraft/server/EntitySlime.java
@@ -24,6 +24,7 @@ public class EntitySlime extends EntityLiving implements IMonster {
         this.datawatcher.a(16, new Byte((byte) 1));
     }
 
+    // CraftBukkit - protected -> public
     public void setSize(int i) {
         this.datawatcher.watch(16, new Byte((byte) i));
         this.a(0.6F * (float) i, 0.6F * (float) i);
@@ -70,8 +71,10 @@ public class EntitySlime extends EntityLiving implements IMonster {
         boolean flag = this.onGround;
 
         super.j_();
+        int i;
+
         if (this.onGround && !flag) {
-            int i = this.getSize();
+            i = this.getSize();
 
             for (int j = 0; j < i * 8; ++j) {
                 float f = this.random.nextFloat() * 3.1415927F * 2.0F;
@@ -83,7 +86,7 @@ public class EntitySlime extends EntityLiving implements IMonster {
             }
 
             if (this.o()) {
-                this.world.makeSound(this, this.n(), this.aV(), ((this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F) / 0.8F);
+                this.makeSound(this.n(), this.aX(), ((this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F) / 0.8F);
             }
 
             this.b = -0.5F;
@@ -92,10 +95,14 @@ public class EntitySlime extends EntityLiving implements IMonster {
         }
 
         this.k();
+        if (this.world.isStatic) {
+            i = this.getSize();
+            this.a(0.6F * (float) i, 0.6F * (float) i);
+        }
     }
 
-    protected void bk() {
-        this.bh();
+    protected void bn() {
+        this.bk();
         EntityHuman entityhuman = this.world.findNearbyVulnerablePlayer(this, 16.0D); // CraftBukkit TODO: EntityTargetEvent
 
         if (entityhuman != null) {
@@ -108,17 +115,17 @@ public class EntitySlime extends EntityLiving implements IMonster {
                 this.jumpDelay /= 3;
             }
 
-            this.bG = true;
+            this.bE = true;
             if (this.q()) {
-                this.world.makeSound(this, this.n(), this.aV(), ((this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F) * 0.8F);
+                this.makeSound(this.n(), this.aX(), ((this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F) * 0.8F);
             }
 
-            this.bD = 1.0F - this.random.nextFloat() * 2.0F;
-            this.bE = (float) (1 * this.getSize());
+            this.bB = 1.0F - this.random.nextFloat() * 2.0F;
+            this.bC = (float) (1 * this.getSize());
         } else {
-            this.bG = false;
+            this.bE = false;
             if (this.onGround) {
-                this.bD = this.bE = 0.0F;
+                this.bB = this.bC = 0.0F;
             }
         }
     }
@@ -167,12 +174,12 @@ public class EntitySlime extends EntityLiving implements IMonster {
         super.die();
     }
 
-    public void b_(EntityHuman entityhuman) {
+    public void c_(EntityHuman entityhuman) {
         if (this.l()) {
             int i = this.getSize();
 
-            if (this.m(entityhuman) && this.e(entityhuman) < 0.6D * (double) i * 0.6D * (double) i && entityhuman.damageEntity(DamageSource.mobAttack(this), this.m())) {
-                this.world.makeSound(this, "mob.attack", 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F);
+            if (this.n(entityhuman) && this.e(entityhuman) < 0.6D * (double) i * 0.6D * (double) i && entityhuman.damageEntity(DamageSource.mobAttack(this), this.m())) {
+                this.makeSound("mob.attack", 1.0F, (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F);
             }
         }
     }
@@ -185,11 +192,11 @@ public class EntitySlime extends EntityLiving implements IMonster {
         return this.getSize();
     }
 
-    protected String aX() {
+    protected String aZ() {
         return "mob.slime." + (this.getSize() > 1 ? "big" : "small");
     }
 
-    protected String aY() {
+    protected String ba() {
         return "mob.slime." + (this.getSize() > 1 ? "big" : "small");
     }
 
@@ -217,11 +224,11 @@ public class EntitySlime extends EntityLiving implements IMonster {
         }
     }
 
-    protected float aV() {
+    protected float aX() {
         return 0.4F * (float) this.getSize();
     }
 
-    public int bm() {
+    public int bp() {
         return 0;
     }