Fixed 1.20.6+ getEnchants

Auxilor · Jun 20, 2024 · 6faaac2 · 6faaac2
1 parent 9ad489b
commit 6faaac2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/...20_6/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_6/FastItemStackFactory.kt b/...20_6/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_20_6/FastItemStackFactory.kt
@@ -62,6 +62,16 @@ class FastItemStackFactory : FastItemStackFactoryProxy {
                 map[bukkit] = level
             }
 
+            if (checkStored) {
+                val stored = handle.get(DataComponents.ENCHANTMENTS) ?: return map
+
+                for ((enchantment, level) in stored.entrySet()) {
+                    val bukkit = CraftEnchantment.minecraftToBukkit(enchantment.value())
+
+                    map[bukkit] = max(map.getOrDefault(bukkit, 0), level)
+                }
+            }
+
             return map
         }
 

diff --git a/.../v1_21/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_21/FastItemStackFactory.kt b/.../v1_21/src/main/kotlin/com/willfp/eco/internal/spigot/proxy/v1_21/FastItemStackFactory.kt
@@ -69,6 +69,16 @@ class FastItemStackFactory : FastItemStackFactoryProxy {
                 map[bukkit] = level
             }
 
+            if (checkStored) {
+                val stored = handle.get(DataComponents.ENCHANTMENTS) ?: return map
+
+                for ((enchantment, level) in stored.entrySet()) {
+                    val bukkit = CraftEnchantment.minecraftToBukkit(enchantment.value())
+
+                    map[bukkit] = max(map.getOrDefault(bukkit, 0), level)
+                }
+            }
+
             return map
         }