upstream/TinkersConstruct
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/TinkersConstruct.git synced 2026-11-13 17:04:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Progwml6 committed 2014-03-01 21:44:33 -05:00
1 parent 9b4b59adbd
commit 5b81260b05
1 file changed
+9 -6
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/tconstruct/util/TEventHandler.java
+9 -6
View File
@@ -224,11 +224,14 @@ public class TEventHandler
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 class TEventHandler
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 class TEventHandler
}
}
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));
}