From 963d0a18976fa1afddfbf63172e3d977b9023f16 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Wed, 12 Jun 2019 06:20:20 -0700
Subject: [PATCH 1/3] Fixed a bug where shovels took too many materials to
 repair

---
 Changelog.txt                                                  | 3 +++
 pom.xml                                                        | 2 +-
 .../nossr50/skills/repair/repairables/SimpleRepairable.java    | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index b01a34d69..d509d6b71 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,3 +1,6 @@
+Version 2.1.78
+
+
 Version 2.1.77
     Added minimum quantity back to Repair config
 
diff --git a/pom.xml b/pom.xml
index ded08ae53..de44cd793 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.77</version>
+    <version>2.1.78-SNAPSHOT</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
diff --git a/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java b/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java
index 21b9fe5b8..aecfac359 100644
--- a/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java
+++ b/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java
@@ -68,7 +68,7 @@ public class SimpleRepairable implements Repairable {
     @Override
     public int getMinimumQuantity() {
         if(minQuantity == -1)
-            return Math.max(SkillUtils.getRepairAndSalvageQuantities(itemMaterial, repairMaterial), 2);
+            return Math.max(SkillUtils.getRepairAndSalvageQuantities(itemMaterial, repairMaterial), 1);
         else
             return minQuantity;
     }

From 98f6eac50c621de058ba81cf02e2618b778ea4d8 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Wed, 12 Jun 2019 10:18:43 -0700
Subject: [PATCH 2/3] Super Abilities don't do extra durability damage to tools
 with the unbreaking enchantment

---
 Changelog.txt                                               | 3 ++-
 .../com/gmail/nossr50/skills/woodcutting/Woodcutting.java   | 6 ++++++
 src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index d509d6b71..b78f2a067 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,6 @@
 Version 2.1.78
-
+    Shovels no longer take more than 1 diamond to repair
+    Tools with the unbreaking enchantment no longer take extra damage from ability usage, they are still subject to the normal durability damage from breaking blocks though.
 
 Version 2.1.77
     Added minimum quantity back to Repair config
diff --git a/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java b/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java
index 078170a18..bae5b12dd 100644
--- a/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java
+++ b/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java
@@ -10,6 +10,7 @@ import com.gmail.nossr50.util.skills.SkillUtils;
 import org.bukkit.Material;
 import org.bukkit.block.BlockFace;
 import org.bukkit.block.BlockState;
+import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
 
 import java.util.ArrayList;
@@ -147,6 +148,11 @@ public final class Woodcutting {
      * @return True if the tool can sustain the durability loss
      */
     protected static boolean handleDurabilityLoss(Set<BlockState> treeFellerBlocks, ItemStack inHand) {
+
+        if(inHand.getItemMeta().getEnchants().get(Enchantment.DURABILITY) >= 1) {
+            return true;
+        }
+
         short durabilityLoss = 0;
         Material type = inHand.getType();
 
diff --git a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java b/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java
index 20760452c..9269cac95 100644
--- a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java
@@ -243,7 +243,7 @@ public class SkillUtils {
      * @param maxDamageModifier the amount to adjust the max damage by
      */
     public static void handleDurabilityChange(ItemStack itemStack, double durabilityModifier, double maxDamageModifier) {
-        if (itemStack.hasItemMeta() && itemStack.getItemMeta().isUnbreakable()) {
+        if (itemStack.getEnchantments().get(Enchantment.DURABILITY) != null && itemStack.getEnchantments().get(Enchantment.DURABILITY) >= 1) {
             return;
         }
 

From ae551a6bc1265c31c410f5c5c3cc15524f44ab4e Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Wed, 12 Jun 2019 10:22:20 -0700
Subject: [PATCH 3/3] 2.1.78

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index de44cd793..bdabf70d4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.78-SNAPSHOT</version>
+    <version>2.1.78</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>