Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2025-02-21 05:21:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed anvil book combining

Browse Source
This commit is contained in:
Auxilor 2022-09-05 14:45:04 +01:00
parent d1284fbcc8
commit 962ef40289
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eco-core/core-plugin/src/main/kotlin/com/willfp/ecoenchants/mechanics/AnvilSupport.kt
View File

@ -175,13 +175,6 @@ class AnvilSupport(
val outEnchants = leftEnchants.toMutableMap() val outEnchants = leftEnchants.toMutableMap()
for ((enchant, level) in rightEnchants) { 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)) { if (outEnchants.containsKey(enchant)) {
val currentLevel = outEnchants[enchant]!! val currentLevel = outEnchants[enchant]!!
outEnchants[enchant] = if (level == currentLevel) { outEnchants[enchant] = if (level == currentLevel) {
@ -189,6 +182,13 @@ class AnvilSupport(
} else { } else {
max(level, currentLevel) 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
}
}
} }
} }