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 2021-08-30 21:58:26 +02:00
parent 24a556eacf 5d8600df12
commit ef7c7ac4fa
No known key found for this signature in database
GPG Key ID: 89A8181384E010A3
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UltimateTimber/Core/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>UltimateTimber</artifactId>
<version>2.2.5</version>
<version>2.2.6</version>
<relativePath>../../</relativePath>
</parent>
@ -26,4 +26,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
</project>
</project>

4
UltimateTimber/Plugin/pom.xml
View File

@ -3,7 +3,7 @@
<parent>
<groupId>com.songoda</groupId>
<artifactId>UltimateTimber</artifactId>
<version>2.2.5</version>
<version>2.2.6</version>
<relativePath>../../</relativePath>
</parent>
@ -120,4 +120,4 @@
<scope>compile</scope>
</dependency>
</dependencies>
</project>
</project>

10
UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeFallManager.java
View File

@ -25,7 +25,6 @@ import org.bukkit.event.Listener;
import org.bukkit.event.block.BlockBreakEvent;
import org.bukkit.inventory.ItemStack;
import java.util.Random;
import java.util.stream.Collectors;
public class TreeFallManager extends Manager implements Listener {
@ -95,7 +94,7 @@ public class TreeFallManager extends Manager implements Listener {
isValid = false;
if (ConfigurationManager.Setting.HOOKS_REQUIRE_ABILITY_ACTIVE.getBoolean()
&& McMMOHook.isUsingTreeFeller(player))
&& !McMMOHook.isUsingTreeFeller(player))
isValid = false;
boolean alwaysReplantSapling = ConfigurationManager.Setting.ALWAYS_REPLANT_SAPLING.getBoolean();
@ -142,8 +141,9 @@ public class TreeFallManager extends Manager implements Listener {
boolean isCreative = player.getGameMode().equals(GameMode.CREATIVE);
if (!isCreative)
new SItemStack(tool).addDamage(player, toolDamage);
if (!isCreative) {
new SItemStack(tool).addDamage(player, toolDamage, true);
}
if (ConfigurationManager.Setting.HOOKS_APPLY_EXPERIENCE.getBoolean()) {
McMMOHook.addWoodcutting(player, detectedTree.getDetectedTreeBlocks().getAllTreeBlocks().stream()
@ -169,6 +169,7 @@ public class TreeFallManager extends Manager implements Listener {
* Checks if a player is doing a certain action required to topple a tree
*
* @param player The player to check
*
* @return True if the check passes, otherwise false
*/
private boolean checkToppleWhile(Player player) {
@ -192,5 +193,4 @@ public class TreeFallManager extends Manager implements Listener {
return (short) treeBlocks.getLogBlocks().size();
}
}
}

2
pom.xml
View File

@ -2,7 +2,7 @@
<groupId>com.songoda</groupId>
<artifactId>UltimateTimber</artifactId>
<version>2.2.5</version>
<version>2.2.6</version>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>