Fix crash on whitelist mod items used for harvesting. #7

wendall911 · Jun 14, 2018 · c62350f · c62350f
1 parent 711ed8a
commit c62350f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/build.properties b/build.properties
@@ -1,6 +1,6 @@
 mod_name=TinkerSurvival
 modid=tinkersurvival
-mod_version=1.0.1.18
+mod_version=1.0.1.19
 last_mod_version=1.0.1.17
 cf_release_type=release
 minecraft_version=1.12.2

diff --git a/files/updates.json b/files/updates.json
@@ -1,7 +1,7 @@
 {
   "homepage": "https://minecraft.curseforge.com/projects/tinkersurvival",
   "1.12.2": {
-    "1.0.1.18": "https://github.com/wendall911/TinkerSurvival/releases/tag/1.0.1.18",
+    "1.0.1.19": "https://github.com/wendall911/TinkerSurvival/releases/tag/1.0.1.19",
     "1.0.1.17": "https://github.com/wendall911/TinkerSurvival/releases/tag/1.0.1.17",
     "1.0.1.16": "https://github.com/wendall911/TinkerSurvival/releases/tag/1.0.1.16",
     "1.0.1.15": "https://github.com/wendall911/TinkerSurvival/releases/tag/1.0.1.15",
@@ -13,7 +13,7 @@
     "1.0.0.23": "https://github.com/wendall911/TinkerSurvival/releases/tag/1.0.0.23"
   },
   "promos": {
-    "1.12.2-latest": "1.0.1.18",
-    "1.12.2-recommended": "1.0.1.18"
+    "1.12.2-latest": "1.0.1.19",
+    "1.12.2-recommended": "1.0.1.19"
   }
 }
diff --git a/src/main/java/tinkersurvival/event/HarvestEventHandler.java b/src/main/java/tinkersurvival/event/HarvestEventHandler.java
@@ -77,9 +77,9 @@ public void slowMining(PlayerEvent.BreakSpeed event) {
         }
 
         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;