mirror of
https://github.com/songoda/UltimateTimber.git
synced 2024-09-26 04:42:39 +02:00
Merge branch 'development'
This commit is contained in:
commit
c39f3cc1bd
@ -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>
|
||||||
|
@ -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>
|
||||||
|
|
||||||
|
@ -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
2
pom.xml
@ -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 -->
|
||||||
|
Loading…
Reference in New Issue
Block a user