Fix potential crash with whitelisted items that aren't tools, but att…

…empt to harvest.
wendall911 · Jun 14, 2018 · 82638a9 · 82638a9
1 parent c62350f
commit 82638a9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/java/tinkersurvival/event/HarvestEventHandler.java b/src/main/java/tinkersurvival/event/HarvestEventHandler.java
@@ -150,9 +150,9 @@ public void breakBlock(BlockEvent.BreakEvent event) {
             String neededToolClass = block.getHarvestTool(event.getState());
 
             if (neededToolClass != null) {
-                if (ItemUse.isWhitelistItem(heldItemStack)) {
-                    String toolClass = ItemUse.getToolClass(heldItemStack);
+                String toolClass = ItemUse.getToolClass(heldItemStack);
 
+                if (ItemUse.isWhitelistItem(heldItemStack) && toolClass != null) {
                     if (neededToolClass.equals(toolClass)) {
                         if (heldItemStack.getItem().getHarvestLevel(heldItemStack, toolClass, null, null) >= neededHarvestLevel) {
                             return;