From 543c4879fee3b7165764c5371d226c93fe3a657b Mon Sep 17 00:00:00 2001
From: Nathan Adams <dinnerbone@dinnerbone.com>
Date: Thu, 1 Mar 2012 10:49:23 +0000
Subject: Updated CraftBukkit to 1.2

---
 src/main/java/net/minecraft/server/EntityPainting.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

diff --git a/src/main/java/net/minecraft/server/EntityPainting.java b/src/main/java/net/minecraft/server/EntityPainting.java
index 7ddef03e..45b00fbb 100644
--- a/src/main/java/net/minecraft/server/EntityPainting.java
+++ b/src/main/java/net/minecraft/server/EntityPainting.java
@@ -120,7 +120,7 @@ public class EntityPainting extends Entity {
         return i == 32 ? 0.5F : (i == 64 ? 0.5F : 0.0F);
     }
 
-    public void y_() {
+    public void G_() {
         if (this.f++ == 100 && !this.world.isStatic) {
             this.f = 0;
             if (!this.survives()) {
@@ -207,7 +207,7 @@ public class EntityPainting extends Entity {
         }
     }
 
-    public boolean e_() {
+    public boolean o_() {
         return true;
     }
 
@@ -235,7 +235,7 @@ public class EntityPainting extends Entity {
             // CraftBukkit end
 
             this.die();
-            this.aM();
+            this.aV();
             this.world.addEntity(new EntityItem(this.world, this.locX, this.locY, this.locZ, new ItemStack(Item.PAINTING)));
         }
 
-- 
cgit v1.2.3