From 3794f40835d972a39d7a42a1b568d5aab17f270c Mon Sep 17 00:00:00 2001 From: squeek Date: Sun, 18 Oct 2015 18:25:50 -0700 Subject: [PATCH] Fix potential null pointer exception --- java/squeek/wailaharvestability/WailaHandler.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/java/squeek/wailaharvestability/WailaHandler.java b/java/squeek/wailaharvestability/WailaHandler.java index 6451a91..12d46f4 100644 --- a/java/squeek/wailaharvestability/WailaHandler.java +++ b/java/squeek/wailaharvestability/WailaHandler.java @@ -145,7 +145,7 @@ public class WailaHandler implements IWailaDataProvider String separator = (!shearability.isEmpty() || !silkTouchability.isEmpty() ? " " : ""); stringList.add(currentlyHarvestable + separator + silkTouchability + (!silkTouchability.isEmpty() ? separator : "") + shearability); } - if (harvestLevel != -1 && showEffectiveTool) + if (harvestLevel != -1 && showEffectiveTool && effectiveTool != null) { String effectiveToolString; if (StatCollector.canTranslate("wailaharvestability.toolclass." + effectiveTool)) @@ -181,7 +181,8 @@ public class WailaHandler implements IWailaDataProvider if (showSilkTouchability && block.canSilkHarvest(player.worldObj, player, position.blockX, position.blockY, position.blockZ, meta)) { - boolean silkTouchMatters = block.getItemDropped(meta, new Random(), 0) != Item.getItemFromBlock(block) || block.quantityDropped(new Random()) <= 0; + Item itemDropped = block.getItemDropped(meta, new Random(), 0); + boolean silkTouchMatters = (itemDropped instanceof ItemBlock && itemDropped != Item.getItemFromBlock(block)) || block.quantityDropped(new Random()) <= 0; if (silkTouchMatters) { boolean hasSilkTouch = EnchantmentHelper.getSilkTouchModifier(player);