alexcrea/CustomAnvil
1
1
Fork 0
mirror of https://github.com/alexcrea/CustomAnvil.git synced 2026-08-28 08:25:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix from rebase

Browse source
This commit is contained in:
alexcrea 2026-05-23 18:30:14 +02:00
parent 38cf25ef1a
commit 109ef0c5df
Signed by: alexcrea
GPG key ID: E59DF23EE2A2266C
3 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/kotlin/io/delilaheve/util/ItemUtil.kt
View file

@ -5,8 +5,8 @@ import org.bukkit.Material.ENCHANTED_BOOK
import org.bukkit.inventory.ItemStack
import org.bukkit.inventory.meta.Damageable
import xyz.alexcrea.cuanvil.update.UpdateUtils
import xyz.alexcrea.cuanvil.enchant.CAEnchantment
import xyz.alexcrea.cuanvil.util.MaterialUtil.customType
import xyz.alexcrea.cuanvil.util.MaxDamageCheckerUtil
import kotlin.math.ceil
import kotlin.math.max
import kotlin.math.min
@ -25,7 +25,7 @@ object ItemUtil {
val ver = UpdateUtils.currentMinecraftVersion()
if(ver.major <= 1 && ver.minor <= 20 && ver.patch < 5) return type.maxDurability.toInt()
return MaxDamageCheckerUtil.getMaxDamage(type, damageable)
return if(damageable.hasMaxDamage()) damageable.maxDamage else type.maxDurability.toInt()
}
/**
@ -49,6 +49,7 @@ object ItemUtil {
val secondDurability = maxDamage - secondDamage
val combinedDurability = firstDurability + secondDurability
val newDurability = min(combinedDurability, maxDamage)
val maxDamage = if(it.hasMaxDamage()) it.maxDamage else Int.MAX_VALUE
meta.damage = min(maxDamage - newDurability, maxDamage)
this.itemMeta = meta