diff --git a/UltimateTimber/Core/pom.xml b/UltimateTimber/Core/pom.xml index af0e119..bbcc18a 100644 --- a/UltimateTimber/Core/pom.xml +++ b/UltimateTimber/Core/pom.xml @@ -3,7 +3,7 @@ com.songoda UltimateTimber - 2.2.5 + 2.2.6 ../../ @@ -26,4 +26,4 @@ compile - \ No newline at end of file + diff --git a/UltimateTimber/Plugin/pom.xml b/UltimateTimber/Plugin/pom.xml index b7941d0..0a96bd6 100644 --- a/UltimateTimber/Plugin/pom.xml +++ b/UltimateTimber/Plugin/pom.xml @@ -3,7 +3,7 @@ com.songoda UltimateTimber - 2.2.5 + 2.2.6 ../../ @@ -120,4 +120,4 @@ compile - \ No newline at end of file + diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeFallManager.java b/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeFallManager.java index 7ceec43..0550eb8 100644 --- a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeFallManager.java +++ b/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeFallManager.java @@ -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(); } } - } diff --git a/pom.xml b/pom.xml index b3aa9f1..6f8d867 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ com.songoda UltimateTimber - 2.2.5 + 2.2.6 4.0.0 pom