[FIX] Enchant that are already presents now take highest level

Dzious · Nov 18, 2020 · ea1e8c2 · ea1e8c2
1 parent f2f4630
commit ea1e8c2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ ___
 [Arkobat]: https://github.com/Arkobat
 [EnchantContol]: https://www.spigotmc.org/resources/enchantcontrol-1-8-1-14-take-back-control-over-all-enchants-on-your-server.55084
 
-[Latest Release]: https://github.com/Dzious/EnchantControl/releases/tag/v1.2.1
+[Latest Release]: https://github.com/Dzious/EnchantControl/releases/tag/v1.2.2
 <!-- [Latest Pre-Release] -->
 
 [Issue Tracker]: https://github.com/Dzious/EnchantControl/issues

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>com.dzious.bukkit.enchantcontrol</groupId>
     <artifactId>EnchantControl_Reforged</artifactId>
-    <version>1.2.1</version>
+    <version>1.2.2</version>
 
     <properties>
         <java.version>1.8</java.version>

diff --git a/src/com/dzious/bukkit/enchantcontrol/listener/AnvilListener.java b/src/com/dzious/bukkit/enchantcontrol/listener/AnvilListener.java
@@ -1,5 +1,8 @@
 package com.dzious.bukkit.enchantcontrol.listener;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import com.dzious.bukkit.enchantcontrol.EnchantControl;
 
 import org.bukkit.enchantments.Enchantment;
@@ -12,9 +15,6 @@
 
 import net.md_5.bungee.api.ChatColor;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public class AnvilListener implements Listener {
     private final EnchantControl plugin;
     boolean bypassMinecraftMaxLevel = false;
@@ -116,7 +116,7 @@ private Map<Enchantment, Integer> computeFusion(ItemStack[] items) {
         if (!items[0].getItemMeta().getEnchants().isEmpty()) {
             lhsEnchantments = new HashMap<>(items[0].getItemMeta().getEnchants()); ;
         } else if (items[0].getItemMeta() instanceof EnchantmentStorageMeta &&
-                !((EnchantmentStorageMeta)items[0].getItemMeta()).getStoredEnchants().isEmpty()) {
+            !((EnchantmentStorageMeta)items[0].getItemMeta()).getStoredEnchants().isEmpty()) {
             lhsEnchantments = new HashMap<>(((EnchantmentStorageMeta)items[0].getItemMeta()).getStoredEnchants());
         } else {
             lhsEnchantments = new HashMap<>();
@@ -132,10 +132,16 @@ private Map<Enchantment, Integer> computeFusion(ItemStack[] items) {
         }
 
         for (Map.Entry<Enchantment, Integer> enchantment : lhsEnchantments.entrySet()) {
-            if (rhsEnchantments.containsKey(enchantment.getKey()) &&
-                enchantment.getValue() == rhsEnchantments.get(enchantment.getKey()) &&
-                enchantment.getValue() < plugin.getEnchantmentManager().getAffectedEnchantments().get(enchantment.getKey())) {
-                enchantments.put(enchantment.getKey(), enchantment.getValue() + 1);
+            if (rhsEnchantments.containsKey(enchantment.getKey())) {
+                if (enchantment.getValue() == rhsEnchantments.get(enchantment.getKey()) &&
+                    enchantment.getValue() < plugin.getEnchantmentManager().getAffectedEnchantments().get(enchantment.getKey())) {
+                    enchantments.put(enchantment.getKey(), enchantment.getValue() + 1);
+                } else if (enchantment.getValue() < rhsEnchantments.get(enchantment.getKey())) {
+                    enchantments.put(enchantment.getKey(), rhsEnchantments.get(enchantment.getKey()));
+                } else {
+                    enchantments.put(enchantment.getKey(), enchantment.getValue());
+
+                }
             } else {
                 enchantments.put(enchantment.getKey(), enchantment.getValue());
             }