diff --git a/UltimateTimber/Core/pom.xml b/UltimateTimber/Core/pom.xml index 4d7a592..1d1b5dd 100644 --- a/UltimateTimber/Core/pom.xml +++ b/UltimateTimber/Core/pom.xml @@ -4,7 +4,7 @@ com.songoda UltimateTimber - 2.3.2 + 2.3.3 ../../pom.xml @@ -22,7 +22,7 @@ com.songoda SongodaCore - 2.6.12 + 2.6.13 compile diff --git a/UltimateTimber/Plugin/pom.xml b/UltimateTimber/Plugin/pom.xml index 5e34fcc..dca7799 100644 --- a/UltimateTimber/Plugin/pom.xml +++ b/UltimateTimber/Plugin/pom.xml @@ -4,7 +4,7 @@ com.songoda UltimateTimber - 2.3.2 + 2.3.3 ../../pom.xml diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java b/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java index 8053f0f..df4a2ee 100644 --- a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java +++ b/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java @@ -324,7 +324,7 @@ public class TreeDefinitionManager extends Manager { for (TreeDefinition treeDefinition : this.treeDefinitions) { if (treeDefinition.isRequiredAxe() || isGlobalAxeRequired()) { - if (new NBTItem(tool).hasKey(requiredAxeKey)) + if (tool != null && !tool.getType().isAir() && new NBTItem(tool).hasKey(requiredAxeKey)) return true; } } @@ -356,7 +356,7 @@ public class TreeDefinitionManager extends Manager { // If the tree definition requires the custom axe, don't allow any other checks to pass. if (treeDefinition.isRequiredAxe() || isGlobalAxeRequired()) { - return new NBTItem(tool).hasKey(requiredAxeKey); + return tool != null && !tool.getType().isAir() && new NBTItem(tool).hasKey(requiredAxeKey); } for (ItemStack requiredTool : treeDefinition.getRequiredTools()) diff --git a/pom.xml b/pom.xml index fc9c724..f073791 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ com.songoda UltimateTimber - 2.3.2 + 2.3.3 pom