From 5f26c992abc4ca3a5265e218368c5dd57f8183b1 Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Sat, 23 Jan 2021 16:28:24 +0000
Subject: [PATCH] Fixed lore getter

---
 .../enchantments/util/HoldItemListener.java   | 110 ++++++++++--------
 1 file changed, 59 insertions(+), 51 deletions(-)

diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/HoldItemListener.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/HoldItemListener.java
index 6cb31c50..10fa3dd5 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/HoldItemListener.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/HoldItemListener.java
@@ -5,6 +5,7 @@ import com.willfp.ecoenchants.display.EnchantDisplay;
 import com.willfp.ecoenchants.enchantments.EcoEnchant;
 import com.willfp.ecoenchants.enchantments.EcoEnchants;
 import org.bukkit.ChatColor;
+import org.bukkit.enchantments.Enchantment;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerItemHeldEvent;
@@ -14,7 +15,9 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class HoldItemListener implements Listener {
 
@@ -38,58 +41,63 @@ public class HoldItemListener implements Listener {
             return;
         }
 
-        if (EnchantDisplay.OPTIONS.isUseLoreGetter()) {
-            List<String> lore = meta.getLore();
+        Map<Enchantment, Integer> toAdd = new HashMap<>();
 
-            if (lore == null) {
-                return;
-            }
-
-            for (String line : new ArrayList<>(lore)) {
-                String rawLine = line;
-                line = ChatColor.stripColor(line);
-
-                EcoEnchant enchant;
-                int level;
-                String[] lineSplit = line.split(" ");
-                if (lineSplit.length == 1) {
-                    enchant = EcoEnchants.getByName(lineSplit[0]);
-                    level = 1;
-                } else {
-                    String levelString = lineSplit[lineSplit.length - 1];
-                    levelString = levelString.replace(" ", "");
-
-                    try {
-                        level = NumberUtils.fromNumeral(levelString);
-                    } catch (IllegalArgumentException e) {
-                        continue;
-                    }
-
-                    StringBuilder nameBuilder = new StringBuilder();
-
-                    for (int i = 0; i < lineSplit.length - 1; i++) {
-                        nameBuilder.append(lineSplit[i]);
-                        if (i != lineSplit.length - 2) {
-                            nameBuilder.append(" ");
-                        }
-                    }
-
-                    enchant = EcoEnchants.getByName(nameBuilder.toString());
-                }
-
-                if (enchant != null) {
-                    if (meta instanceof EnchantmentStorageMeta) {
-                        ((EnchantmentStorageMeta) meta).addStoredEnchant(enchant, level, true);
-                        lore.clear();
-                    } else {
-                        meta.addEnchant(enchant, level, true);
-                        lore.remove(rawLine);
-                    }
-                }
-            }
-
-            meta.setLore(lore);
-            itemStack.setItemMeta(meta);
+        if (!EnchantDisplay.OPTIONS.isUseLoreGetter()) {
+            return;
         }
+
+        List<String> lore = meta.getLore();
+
+        if (lore == null) {
+            return;
+        }
+
+        for (String line : new ArrayList<>(lore)) {
+            String rawLine = line;
+            line = ChatColor.stripColor(line);
+
+            EcoEnchant enchant;
+            int level;
+            String[] lineSplit = line.split(" ");
+            if (lineSplit.length == 1) {
+                enchant = EcoEnchants.getByName(lineSplit[0]);
+                level = 1;
+            } else {
+                String levelString = lineSplit[lineSplit.length - 1];
+                levelString = levelString.replace(" ", "");
+
+                try {
+                    level = NumberUtils.fromNumeral(levelString);
+                } catch (IllegalArgumentException e) {
+                    continue;
+                }
+
+                StringBuilder nameBuilder = new StringBuilder();
+
+                for (int i = 0; i < lineSplit.length - 1; i++) {
+                    nameBuilder.append(lineSplit[i]);
+                    if (i != lineSplit.length - 2) {
+                        nameBuilder.append(" ");
+                    }
+                }
+
+                enchant = EcoEnchants.getByName(nameBuilder.toString());
+            }
+
+            if (enchant != null) {
+                lore.remove(rawLine);
+                toAdd.put(enchant, level);
+            }
+        }
+
+        if (meta instanceof EnchantmentStorageMeta) {
+            lore.clear();
+            toAdd.forEach((enchantment, integer) -> ((EnchantmentStorageMeta) meta).addStoredEnchant(enchantment, integer, true));
+        } else {
+            toAdd.forEach((enchantment, integer) -> meta.addEnchant(enchantment, integer, true));
+        }
+        meta.setLore(lore);
+        itemStack.setItemMeta(meta);
     }
 }