Update for 1.0.0

1 files changed, 22 insertions, 28 deletions

diff --git a/src/main/java/net/minecraft/server/EntityPainting.java b/src/main/java/net/minecraft/server/EntityPainting.java
index c0441a8e..7ab4def7 100644
--- a/src/main/java/net/minecraft/server/EntityPainting.java
+++ b/src/main/java/net/minecraft/server/EntityPainting.java
@@ -43,7 +43,7 @@ public class EntityPainting extends Entity {
 
             this.e = enumart;
             this.b(l);
-            if (this.i()) {
+            if (this.j()) {
                 arraylist.add(enumart);
             }
         }
@@ -121,10 +121,10 @@ public class EntityPainting extends Entity {
         return i == 32 ? 0.5F : (i == 64 ? 0.5F : 0.0F);
     }
 
-    public void s_() {
+    public void w_() {
         if (this.f++ == 100 && !this.world.isStatic) {
             this.f = 0;
-            if (!this.i()) {
+            if (!this.j()) {
                 // CraftBukkit start
                 Material material = this.world.getMaterial((int)this.locX, (int)this.locY, (int)this.locZ);
                 RemoveCause cause;
@@ -152,7 +152,7 @@ public class EntityPainting extends Entity {
         }
     }
 
-    public boolean i() {
+    public boolean j() {
         if (this.world.getEntities(this, this.boundingBox).size() > 0) {
             return false;
         } else {
@@ -210,7 +210,7 @@ public class EntityPainting extends Entity {
         }
     }
 
-    public boolean r_() {
+    public boolean e_() {
         return true;
     }
 
@@ -234,12 +234,12 @@ public class EntityPainting extends Entity {
                 }
             }
 
-            if(!dead) {
-                this.die();
-                this.aq();
-                this.world.addEntity(new EntityItem(this.world, this.locX, this.locY, this.locZ, new ItemStack(Item.PAINTING)));
-            }
+            if (dead) return true;
             // CraftBukkit end
+
+            this.die();
+            this.aB();
+            this.world.addEntity(new EntityItem(this.world, this.locX, this.locY, this.locZ, new ItemStack(Item.PAINTING)));
         }
 
         return true;
@@ -259,7 +259,7 @@ public class EntityPainting extends Entity {
 
         ++this.fireTicks;
         if (this.fireTicks == 0) {
-            this.fireTicks = 300;
+            this.j(8);
         }
     }
     // CraftBukkit end
@@ -273,10 +273,10 @@ public class EntityPainting extends Entity {
     }
 
     public void a(NBTTagCompound nbttagcompound) {
-        this.a = nbttagcompound.c("Dir");
-        this.b = nbttagcompound.e("TileX");
-        this.c = nbttagcompound.e("TileY");
-        this.d = nbttagcompound.e("TileZ");
+        this.a = nbttagcompound.d("Dir");
+        this.b = nbttagcompound.f("TileX");
+        this.c = nbttagcompound.f("TileY");
+        this.d = nbttagcompound.f("TileZ");
         String s = nbttagcompound.getString("Motive");
         EnumArt[] aenumart = EnumArt.values();
         int i = aenumart.length;
@@ -298,25 +298,19 @@ public class EntityPainting extends Entity {
 
     public void move(double d0, double d1, double d2) {
         if (!this.world.isStatic && d0 * d0 + d1 * d1 + d2 * d2 > 0.0D) {
+            if (dead) return; // CraftBukkit
 
-            // CraftBukkit start
-            if(!dead) {
-                this.die();
-                this.world.addEntity(new EntityItem(this.world, this.locX, this.locY, this.locZ, new ItemStack(Item.PAINTING)));
-            }
-            // CraftBukkit end
+            this.die();
+            this.world.addEntity(new EntityItem(this.world, this.locX, this.locY, this.locZ, new ItemStack(Item.PAINTING)));
         }
     }
 
-    public void b(double d0, double d1, double d2) {
+    public void b_(double d0, double d1, double d2) {
         if (!this.world.isStatic && d0 * d0 + d1 * d1 + d2 * d2 > 0.0D) {
+            if (dead) return; // CraftBukkit
 
-            // CraftBukkit start
-            if(!dead) {
-                this.die();
-                this.world.addEntity(new EntityItem(this.world, this.locX, this.locY, this.locZ, new ItemStack(Item.PAINTING)));
-            }
-            // CraftBukkit end
+            this.die();
+            this.world.addEntity(new EntityItem(this.world, this.locX, this.locY, this.locZ, new ItemStack(Item.PAINTING)));
         }
     }
 }