From b075a58657b09e01d13c917ea8dbcdbaa712fd13 Mon Sep 17 00:00:00 2001
From: Tahg <tahgtahv@gmail.com>
Date: Tue, 26 Apr 2011 15:39:25 -0400
Subject: fixed painting NPE

---
 src/main/java/net/minecraft/server/EntityPainting.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 e2b2e47f..b5406a71 100644
--- a/src/main/java/net/minecraft/server/EntityPainting.java
+++ b/src/main/java/net/minecraft/server/EntityPainting.java
@@ -206,7 +206,7 @@ public class EntityPainting extends Entity {
 
             // CraftBukkit start
             Painting painting = (Painting) getBukkitEntity();
-            PaintingBreakByEntityEvent event = new PaintingBreakByEntityEvent(painting,entity.getBukkitEntity());
+            PaintingBreakByEntityEvent event = new PaintingBreakByEntityEvent(painting, entity == null ? null : entity.getBukkitEntity());
             Bukkit.getServer().getPluginManager().callEvent(event);
             if (event.isCancelled()) {
                 return true;
-- 
cgit v1.2.3