Upstream
/
UltimateTimber
mirror of https://github.com/songoda/UltimateTimber.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

This commit is contained in:
Christian Koop 2022-07-07 20:09:52 +02:00
parent 7f1c9ab3a3 ad153088eb
commit c39f3cc1bd
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UltimateTimber/Core/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>UltimateTimber</artifactId> <artifactId>UltimateTimber</artifactId>
<version>2.3.2</version> <version>2.3.3</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
@ -22,7 +22,7 @@
<dependency> <dependency>
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>SongodaCore</artifactId> <artifactId>SongodaCore</artifactId>
<version>2.6.12</version> <version>2.6.13</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
</dependencies> </dependencies>

2
UltimateTimber/Plugin/pom.xml
View File

@ -4,7 +4,7 @@
<parent> <parent>
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>UltimateTimber</artifactId> <artifactId>UltimateTimber</artifactId>
<version>2.3.2</version> <version>2.3.3</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>

4
UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeDefinitionManager.java
View File

@ -324,7 +324,7 @@ public class TreeDefinitionManager extends Manager {
for (TreeDefinition treeDefinition : this.treeDefinitions) { for (TreeDefinition treeDefinition : this.treeDefinitions) {
if (treeDefinition.isRequiredAxe() || isGlobalAxeRequired()) { if (treeDefinition.isRequiredAxe() || isGlobalAxeRequired()) {
if (new NBTItem(tool).hasKey(requiredAxeKey)) if (tool != null && !tool.getType().isAir() && new NBTItem(tool).hasKey(requiredAxeKey))
return true; 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 the tree definition requires the custom axe, don't allow any other checks to pass.
if (treeDefinition.isRequiredAxe() || isGlobalAxeRequired()) { 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()) for (ItemStack requiredTool : treeDefinition.getRequiredTools())

2
pom.xml
View File

@ -3,7 +3,7 @@
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>UltimateTimber</artifactId> <artifactId>UltimateTimber</artifactId>
<version>2.3.2</version> <version>2.3.3</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<!-- Run 'mvn versions:set -DgenerateBackupPoms=false -DnewVersion=X.Y.Z' to update version recursively --> <!-- Run 'mvn versions:set -DgenerateBackupPoms=false -DnewVersion=X.Y.Z' to update version recursively -->