From a8750a17e4f1b3d3742ef41be6ef6a1d25896b41 Mon Sep 17 00:00:00 2001
From: BuildTools <unconfigured@null.spigotmc.org>
Date: Fri, 11 Aug 2023 00:14:03 +0500
Subject: [PATCH] Added missing charges check

---
 Core/pom.xml                                         | 12 ++++++------
 .../enchantment/impl/ExcellentEnchant.java           |  4 ++++
 .../enchantment/util/EnchantUtils.java               |  3 ---
 NMS/pom.xml                                          |  2 +-
 V1_17_R1/pom.xml                                     |  4 ++--
 V1_18_R2/pom.xml                                     |  4 ++--
 V1_19_R3/pom.xml                                     |  4 ++--
 V1_20_R1/pom.xml                                     |  4 ++--
 pom.xml                                              |  2 +-
 9 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/Core/pom.xml b/Core/pom.xml
index 54ccd51..685c3d6 100644
--- a/Core/pom.xml
+++ b/Core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ExcellentEnchants</artifactId>
         <groupId>su.nightexpress.excellentenchants</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -81,27 +81,27 @@
         <dependency>
             <groupId>su.nightexpress.excellentenchants</groupId>
             <artifactId>NMS</artifactId>
-            <version>3.5.3</version>
+            <version>3.5.4</version>
         </dependency>
         <dependency>
             <groupId>su.nightexpress.excellentenchants</groupId>
             <artifactId>V1_17_R1</artifactId>
-            <version>3.5.3</version>
+            <version>3.5.4</version>
         </dependency>
         <dependency>
             <groupId>su.nightexpress.excellentenchants</groupId>
             <artifactId>V1_18_R2</artifactId>
-            <version>3.5.3</version>
+            <version>3.5.4</version>
         </dependency>
         <dependency>
             <groupId>su.nightexpress.excellentenchants</groupId>
             <artifactId>V1_19_R3</artifactId>
-            <version>3.5.3</version>
+            <version>3.5.4</version>
         </dependency>
         <dependency>
             <groupId>su.nightexpress.excellentenchants</groupId>
             <artifactId>V1_20_R1</artifactId>
-            <version>3.5.3</version>
+            <version>3.5.4</version>
         </dependency>
     </dependencies>
 
diff --git a/Core/src/main/java/su/nightexpress/excellentenchants/enchantment/impl/ExcellentEnchant.java b/Core/src/main/java/su/nightexpress/excellentenchants/enchantment/impl/ExcellentEnchant.java
index 7855d54..4fbe20b 100644
--- a/Core/src/main/java/su/nightexpress/excellentenchants/enchantment/impl/ExcellentEnchant.java
+++ b/Core/src/main/java/su/nightexpress/excellentenchants/enchantment/impl/ExcellentEnchant.java
@@ -358,11 +358,15 @@ public abstract class ExcellentEnchant extends Enchantment implements IEnchantme
 
     @Override
     public void consumeChargesNoUpdate(@NotNull ItemStack item, int level) {
+        if (!this.isChargesEnabled()) return;
+
         EnchantUtils.consumeCharges(item, this, level);
     }
 
     @Override
     public void consumeCharges(@NotNull ItemStack item, int level) {
+        if (!this.isChargesEnabled()) return;
+
         this.consumeChargesNoUpdate(item, level);
         EnchantUtils.updateDisplay(item);
     }
diff --git a/Core/src/main/java/su/nightexpress/excellentenchants/enchantment/util/EnchantUtils.java b/Core/src/main/java/su/nightexpress/excellentenchants/enchantment/util/EnchantUtils.java
index 54daf9d..746a549 100644
--- a/Core/src/main/java/su/nightexpress/excellentenchants/enchantment/util/EnchantUtils.java
+++ b/Core/src/main/java/su/nightexpress/excellentenchants/enchantment/util/EnchantUtils.java
@@ -282,9 +282,6 @@ public class EnchantUtils {
     }
 
     public static void consumeCharges(@NotNull ItemStack item, @NotNull ExcellentEnchant enchant, int level) {
-        if (!enchant.isChargesEnabled()) return;
-
-        //int level = getLevel(item, enchant);
         int has = getCharges(item, enchant);
         int use = enchant.getChargesConsumeAmount(level);
         setCharges(item, enchant, level,has - use);
diff --git a/NMS/pom.xml b/NMS/pom.xml
index 83502de..7ee132a 100644
--- a/NMS/pom.xml
+++ b/NMS/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ExcellentEnchants</artifactId>
         <groupId>su.nightexpress.excellentenchants</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/V1_17_R1/pom.xml b/V1_17_R1/pom.xml
index 966cfed..644d8f2 100644
--- a/V1_17_R1/pom.xml
+++ b/V1_17_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ExcellentEnchants</artifactId>
         <groupId>su.nightexpress.excellentenchants</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>su.nightexpress.excellentenchants</groupId>
             <artifactId>NMS</artifactId>
-            <version>3.5.3</version>
+            <version>3.5.4</version>
         </dependency>
     </dependencies>
 
diff --git a/V1_18_R2/pom.xml b/V1_18_R2/pom.xml
index d5af126..79c49b1 100644
--- a/V1_18_R2/pom.xml
+++ b/V1_18_R2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ExcellentEnchants</artifactId>
         <groupId>su.nightexpress.excellentenchants</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>su.nightexpress.excellentenchants</groupId>
             <artifactId>NMS</artifactId>
-            <version>3.5.3</version>
+            <version>3.5.4</version>
         </dependency>
     </dependencies>
 
diff --git a/V1_19_R3/pom.xml b/V1_19_R3/pom.xml
index 42beb6d..26110ed 100644
--- a/V1_19_R3/pom.xml
+++ b/V1_19_R3/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ExcellentEnchants</artifactId>
         <groupId>su.nightexpress.excellentenchants</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>su.nightexpress.excellentenchants</groupId>
             <artifactId>NMS</artifactId>
-            <version>3.5.3</version>
+            <version>3.5.4</version>
         </dependency>
     </dependencies>
 
diff --git a/V1_20_R1/pom.xml b/V1_20_R1/pom.xml
index c4f881d..0921015 100644
--- a/V1_20_R1/pom.xml
+++ b/V1_20_R1/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ExcellentEnchants</artifactId>
         <groupId>su.nightexpress.excellentenchants</groupId>
-        <version>3.5.3</version>
+        <version>3.5.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>su.nightexpress.excellentenchants</groupId>
             <artifactId>NMS</artifactId>
-            <version>3.5.3</version>
+            <version>3.5.4</version>
         </dependency>
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
index 6032ef6..e15dd08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>su.nightexpress.excellentenchants</groupId>
     <artifactId>ExcellentEnchants</artifactId>
     <packaging>pom</packaging>
-    <version>3.5.3</version>
+    <version>3.5.4</version>
     <modules>
         <module>Core</module>
         <module>NMS</module>