From fcc8f6153affbf47cf080bb39c9ca8dbcb91e800 Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 29 Dec 2015 15:09:56 -0800 Subject: [PATCH] Fix NPE when checking held item --- .../java/WayofTime/bloodmagic/util/handler/EventHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java index 06437281..419314b9 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java @@ -75,7 +75,7 @@ public class EventHandler { @SubscribeEvent public void onBlockBreak(BlockEvent.BreakEvent event) { if (!event.world.isRemote && event.getPlayer() != null) { - if (event.getPlayer().capabilities.isCreativeMode && event.getPlayer().getCurrentEquippedItem().getItem() instanceof ItemBoundSword) { + if (event.getPlayer().capabilities.isCreativeMode && event.getPlayer().getCurrentEquippedItem() != null && event.getPlayer().getCurrentEquippedItem().getItem() instanceof ItemBoundSword) { event.setCanceled(true); } }