1 files changed, 38 insertions, 28 deletions

diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
index 06f85fdc..671384d5 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -154,16 +154,21 @@ public abstract class Entity {
     }
 
     protected void a(float f, float f1) {
+        float f2;
+
         if (f != this.width || f1 != this.length) {
+            f2 = this.width;
             this.width = f;
             this.length = f1;
             this.boundingBox.d = this.boundingBox.a + (double) this.width;
             this.boundingBox.f = this.boundingBox.c + (double) this.width;
             this.boundingBox.e = this.boundingBox.b + (double) this.length;
+            if (this.width > f2 && !this.justCreated && !this.world.isStatic) {
+                this.move((double) (f2 - this.width), 0.0D, (double) (f2 - this.width));
+            }
         }
 
-        float f2 = f % 2.0F;
-
+        f2 = f % 2.0F;
         if ((double) f2 < 0.375D) {
             this.at = EnumEntitySize.SIZE_1;
         } else if ((double) f2 < 0.75D) {
@@ -248,7 +253,7 @@ public abstract class Entity {
                 if (true || minecraftserver.getAllowNether()) { // CraftBukkit
                     if (this.vehicle == null && this.aq++ >= i) {
                         this.aq = i;
-                        this.portalCooldown = this.aa();
+                        this.portalCooldown = this.ab();
                         byte b0;
 
                         if (this.world.worldProvider.dimension == -1) {
@@ -1032,7 +1037,7 @@ public abstract class Entity {
     public void b(Entity entity, int i) {}
 
     public boolean c(NBTTagCompound nbttagcompound) {
-        String s = this.O();
+        String s = this.P();
 
         if (!this.dead && s != null) {
             nbttagcompound.setString("id", s);
@@ -1044,7 +1049,7 @@ public abstract class Entity {
     }
 
     public boolean d(NBTTagCompound nbttagcompound) {
-        String s = this.O();
+        String s = this.P();
 
         if (!this.dead && s != null && this.passenger == null) {
             nbttagcompound.setString("id", s);
@@ -1145,6 +1150,9 @@ public abstract class Entity {
             this.setPosition(this.locX, this.locY, this.locZ);
             this.b(this.yaw, this.pitch);
             this.a(nbttagcompound);
+            if (this.O()) {
+                this.setPosition(this.locX, this.locY, this.locZ);
+            }
 
             // CraftBukkit start
             if (this instanceof EntityLiving) {
@@ -1206,7 +1214,11 @@ public abstract class Entity {
         }
     }
 
-    protected final String O() {
+    protected boolean O() {
+        return true;
+    }
+
+    protected final String P() {
         return EntityTypes.b(this);
     }
 
@@ -1214,7 +1226,7 @@ public abstract class Entity {
 
     protected abstract void b(NBTTagCompound nbttagcompound);
 
-    public void P() {}
+    public void Q() {}
 
     protected NBTTagList a(double... adouble) {
         NBTTagList nbttaglist = new NBTTagList();
@@ -1293,7 +1305,7 @@ public abstract class Entity {
         return null;
     }
 
-    public void T() {
+    public void U() {
         if (this.vehicle.dead) {
             this.vehicle = null;
         } else {
@@ -1302,7 +1314,7 @@ public abstract class Entity {
             this.motZ = 0.0D;
             this.l_();
             if (this.vehicle != null) {
-                this.vehicle.U();
+                this.vehicle.V();
                 this.g += (double) (this.vehicle.yaw - this.vehicle.lastYaw);
 
                 for (this.f += (double) (this.vehicle.pitch - this.vehicle.lastPitch); this.g >= 180.0D; this.g -= 360.0D) {
@@ -1343,23 +1355,21 @@ public abstract class Entity {
 
                 this.g -= d0;
                 this.f -= d1;
-                this.yaw = (float) ((double) this.yaw + d0);
-                this.pitch = (float) ((double) this.pitch + d1);
             }
         }
     }
 
-    public void U() {
+    public void V() {
         if (this.passenger != null) {
-            this.passenger.setPosition(this.locX, this.locY + this.W() + this.passenger.V(), this.locZ);
+            this.passenger.setPosition(this.locX, this.locY + this.X() + this.passenger.W(), this.locZ);
         }
     }
 
-    public double V() {
+    public double W() {
         return (double) this.height;
     }
 
-    public double W() {
+    public double X() {
         return (double) this.length * 0.75D;
     }
 
@@ -1421,17 +1431,17 @@ public abstract class Entity {
         }
     }
 
-    public float X() {
+    public float Y() {
         return 0.1F;
     }
 
-    public Vec3D Y() {
+    public Vec3D Z() {
         return null;
     }
 
-    public void Z() {
+    public void aa() {
         if (this.portalCooldown > 0) {
-            this.portalCooldown = this.aa();
+            this.portalCooldown = this.ab();
         } else {
             double d0 = this.lastX - this.locX;
             double d1 = this.lastZ - this.locZ;
@@ -1444,7 +1454,7 @@ public abstract class Entity {
         }
     }
 
-    public int aa() {
+    public int ab() {
         return 900;
     }
 
@@ -1458,7 +1468,7 @@ public abstract class Entity {
         return !this.fireProof && (this.fireTicks > 0 || this.f(0));
     }
 
-    public boolean ae() {
+    public boolean af() {
         return this.vehicle != null;
     }
 
@@ -1625,7 +1635,7 @@ public abstract class Entity {
         }
     }
 
-    public void ak() {
+    public void al() {
         this.K = true;
         this.fallDistance = 0.0F;
     }
@@ -1640,7 +1650,7 @@ public abstract class Entity {
         return LocaleI18n.get("entity." + s + ".name");
     }
 
-    public Entity[] am() {
+    public Entity[] an() {
         return null;
     }
 
@@ -1652,7 +1662,7 @@ public abstract class Entity {
         return 0.0F;
     }
 
-    public boolean ao() {
+    public boolean ap() {
         return true;
     }
 
@@ -1774,15 +1784,15 @@ public abstract class Entity {
         return true;
     }
 
-    public int aq() {
+    public int ar() {
         return 3;
     }
 
-    public int ar() {
+    public int as() {
         return this.as;
     }
 
-    public boolean as() {
+    public boolean at() {
         return false;
     }
 
@@ -1799,7 +1809,7 @@ public abstract class Entity {
         return this.uniqueID;
     }
 
-    public boolean av() {
+    public boolean aw() {
         return true;
     }