make sure that empty hand's don't cause NPE's in the even handler

SlimeKnights · Mar 2, 2014 · 5b81260 · 5b81260
1 parent 9b4b59a
commit 5b81260
Showing 1 changed file with 9 additions and 6 deletions.
diff --git 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,15 +370,15 @@ 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)
                         {
                             addDrops(event, new ItemStack(Items.skull, 1, 2));
                         }
                     }
 
-                    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));
                     }