From 1e2a41fd9047d8551d1842644d8ceba3e56d7a92 Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Sun, 29 Aug 2021 14:28:47 +0200
Subject: [PATCH 1/3] Take Unbreaking-Enchantment into consideration [SD-8182]

---
 UltimateTimber/Plugin/pom.xml                             | 2 +-
 .../songoda/ultimatetimber/manager/TreeFallManager.java   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/UltimateTimber/Plugin/pom.xml b/UltimateTimber/Plugin/pom.xml
index b7941d0..dc02d65 100644
--- a/UltimateTimber/Plugin/pom.xml
+++ b/UltimateTimber/Plugin/pom.xml
@@ -120,4 +120,4 @@
             <scope>compile</scope>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeFallManager.java b/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeFallManager.java
index 7ceec43..f9680eb 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 {
@@ -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();
         }
     }
-
 }

From 5cc632f62593932bb0d7ee00a6e2a60786c9bd3b Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Sun, 29 Aug 2021 15:26:28 +0200
Subject: [PATCH 2/3] Fixes mcMMO Treefeller-Check [SD-8327]

---
 .../src/com/songoda/ultimatetimber/manager/TreeFallManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeFallManager.java b/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeFallManager.java
index f9680eb..0550eb8 100644
--- a/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeFallManager.java
+++ b/UltimateTimber/Plugin/src/com/songoda/ultimatetimber/manager/TreeFallManager.java
@@ -94,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();

From 5d8600df126f276acabfbfb19d249737d9b50cbf Mon Sep 17 00:00:00 2001
From: Christian Koop <contact@sprax2013.de>
Date: Sun, 29 Aug 2021 15:46:41 +0200
Subject: [PATCH 3/3] Version 2.2.6

---
 UltimateTimber/Core/pom.xml   | 4 ++--
 UltimateTimber/Plugin/pom.xml | 2 +-
 pom.xml                       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

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 @@
     <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>
\ No newline at end of file
+</project>
diff --git a/UltimateTimber/Plugin/pom.xml b/UltimateTimber/Plugin/pom.xml
index dc02d65..0a96bd6 100644
--- a/UltimateTimber/Plugin/pom.xml
+++ b/UltimateTimber/Plugin/pom.xml
@@ -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>
 
diff --git a/pom.xml b/pom.xml
index b3aa9f1..6f8d867 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>