summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2012-10-31 11:30:29 -0500
committerEvilSeph <evilseph@gmail.com>2012-10-31 13:09:57 -0400
commit347fd3cb6e135f9d8053678f9f4fa4349d8ce128 (patch)
tree5b0306ec1e8b42153645e26e2e718f6b417bdcff
parentf479aa84a467f8b684d9f8885165a4ef891def13 (diff)
downloadcraftbukkit-347fd3cb6e135f9d8053678f9f4fa4349d8ce128.tar
craftbukkit-347fd3cb6e135f9d8053678f9f4fa4349d8ce128.tar.gz
craftbukkit-347fd3cb6e135f9d8053678f9f4fa4349d8ce128.tar.lz
craftbukkit-347fd3cb6e135f9d8053678f9f4fa4349d8ce128.tar.xz
craftbukkit-347fd3cb6e135f9d8053678f9f4fa4349d8ce128.zip
Fix NPE when blowing up an item frame. Fixes BUKKIT-2763
-rw-r--r--src/main/java/net/minecraft/server/EntityHanging.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/EntityHanging.java b/src/main/java/net/minecraft/server/EntityHanging.java
index fcdbefc5..0db41ca1 100644
--- a/src/main/java/net/minecraft/server/EntityHanging.java
+++ b/src/main/java/net/minecraft/server/EntityHanging.java
@@ -226,7 +226,7 @@ public abstract class EntityHanging extends Entity {
this.world.getServer().getPluginManager().callEvent(paintingEvent);
}
- if (dead || event.isCancelled() || (paintingEvent != null && paintingEvent.isCancelled())) {
+ if (dead || (event != null && event.isCancelled()) || (paintingEvent != null && paintingEvent.isCancelled())) {
return true;
}
// CraftBukkit end