From 962ef40289c01168dc503721cd02e792364eb2e0 Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Mon, 5 Sep 2022 14:45:04 +0100
Subject: [PATCH] Fixed anvil book combining

---
 .../willfp/ecoenchants/mechanics/AnvilSupport.kt   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/mechanics/AnvilSupport.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/mechanics/AnvilSupport.kt
index f2f4e254..33b10b66 100644
--- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/mechanics/AnvilSupport.kt
+++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/mechanics/AnvilSupport.kt
@@ -175,13 +175,6 @@ class AnvilSupport(
         val outEnchants = leftEnchants.toMutableMap()
 
         for ((enchant, level) in rightEnchants) {
-            // Running .wrap() to use EcoEnchantLike canEnchantItem logic
-            if (enchant.wrap().canEnchantItem(left) && !outEnchants.containsKey(enchant)) {
-                if (outEnchants.size < plugin.configYml.getInt("anvil.enchant-limit").infiniteIfNegative()) {
-                    outEnchants[enchant] = level
-                }
-            }
-
             if (outEnchants.containsKey(enchant)) {
                 val currentLevel = outEnchants[enchant]!!
                 outEnchants[enchant] = if (level == currentLevel) {
@@ -189,6 +182,13 @@ class AnvilSupport(
                 } else {
                     max(level, currentLevel)
                 }
+            } else {
+                // Running .wrap() to use EcoEnchantLike canEnchantItem logic
+                if (enchant.wrap().canEnchantItem(left)) {
+                    if (outEnchants.size < plugin.configYml.getInt("anvil.enchant-limit").infiniteIfNegative()) {
+                        outEnchants[enchant] = level
+                    }
+                }
             }
         }