From 347fd3cb6e135f9d8053678f9f4fa4349d8ce128 Mon Sep 17 00:00:00 2001 From: Travis Watkins Date: Wed, 31 Oct 2012 11:30:29 -0500 Subject: [PATCH] Fix NPE when blowing up an item frame. Fixes BUKKIT-2763 --- src/main/java/net/minecraft/server/EntityHanging.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityHanging.java b/src/main/java/net/minecraft/server/EntityHanging.java index fcdbefc508..0db41ca1a1 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