summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server
diff options
context:
space:
mode:
authorTahg <tahgtahv@gmail.com>2011-04-26 15:39:25 -0400
committerTahg <tahgtahv@gmail.com>2011-04-26 15:40:24 -0400
commitb075a58657b09e01d13c917ea8dbcdbaa712fd13 (patch)
tree1a2393ee715b6bf969f489a8d265459f0b171c90 /src/main/java/net/minecraft/server
parent67119756583096b1ca04fa79beb2dc1d7497e08b (diff)
downloadcraftbukkit-b075a58657b09e01d13c917ea8dbcdbaa712fd13.tar
craftbukkit-b075a58657b09e01d13c917ea8dbcdbaa712fd13.tar.gz
craftbukkit-b075a58657b09e01d13c917ea8dbcdbaa712fd13.tar.lz
craftbukkit-b075a58657b09e01d13c917ea8dbcdbaa712fd13.tar.xz
craftbukkit-b075a58657b09e01d13c917ea8dbcdbaa712fd13.zip
fixed painting NPE
Diffstat (limited to 'src/main/java/net/minecraft/server')
-rw-r--r--src/main/java/net/minecraft/server/EntityPainting.java2
1 files changed, 1 insertions, 1 deletions
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;