From 5b81260b0561020e84c594685dd144cec731b2a5 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Sat, 1 Mar 2014 21:44:33 -0500 Subject: [PATCH] make sure that empty hand's don't cause NPE's in the even handler --- src/main/java/tconstruct/util/TEventHandler.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/tconstruct/util/TEventHandler.java b/src/main/java/tconstruct/util/TEventHandler.java index a91b4d14947..928ebb2ca94 100644 --- a/src/main/java/tconstruct/util/TEventHandler.java +++ b/src/main/java/tconstruct/util/TEventHandler.java @@ -224,11 +224,14 @@ public static ItemStack craftFletching (ItemStack stack) public static boolean matchesLeaves (ItemStack stack) { - Block block = BlockUtils.getBlockFromItem(stack.getItem()); - if (block != null) + if (stack != null) { - if (block.isLeaves(null, 0, 0, 0)) - return true; + Block block = BlockUtils.getBlockFromItem(stack.getItem()); + if (block != null) + { + if (block.isLeaves(null, 0, 0, 0)) + return true; + } } return false; } @@ -367,7 +370,7 @@ public void onLivingDrop (LivingDropsEvent event) if (stack != null && stack.hasTagCompound() && stack.getItem() instanceof ToolCore) { int beheading = stack.getTagCompound().getCompoundTag("InfiTool").getInteger("Beheading"); - if (stack.getItem() == TRepo.cleaver) + if (stack != null && stack.hasTagCompound() && stack.getItem() == TRepo.cleaver) beheading += 2; if (beheading > 0 && random.nextInt(100) < beheading * 10) { @@ -375,7 +378,7 @@ public void onLivingDrop (LivingDropsEvent event) } } - if (stack.getItem() == TRepo.cleaver && random.nextInt(100) < 10) //Swap out for real beheading + if (stack != null && stack.hasTagCompound() && stack.getItem() == TRepo.cleaver && random.nextInt(100) < 10) //Swap out for real beheading { addDrops(event, new ItemStack(Items.skull, 1, 2)); }