fix forgot

This commit is contained in:
alexcrea 2025-12-30 02:18:11 +01:00
parent a6cee2d591
commit 161ef6ba91
Signed by: alexcrea
GPG key ID: E346CD16413450E3

View file

@ -41,7 +41,7 @@ class PrepareAnvilListener : Listener {
} }
private fun ItemStack?.isAir(): Boolean { private fun ItemStack?.isAir(): Boolean {
return this == null || this.isEmpty return this == null || this.type.isAir || this.amount == 0
} }
/** /**
@ -87,10 +87,9 @@ class PrepareAnvilListener : Listener {
doRenaming(event, inventory, player, first) doRenaming(event, inventory, player, first)
return return
} }
second as ItemStack // not air we know it's not null
// Test for merge // Test for merge
if (first.canMergeWith(second)) { if (first.canMergeWith(second!!)) {
doMerge(event, inventory, player, first, second) doMerge(event, inventory, player, first, second)
return return
} }
@ -109,7 +108,7 @@ class PrepareAnvilListener : Listener {
private fun isImmutable(item: ItemStack?): Boolean { private fun isImmutable(item: ItemStack?): Boolean {
if (item.isAir()) return false if (item.isAir()) return false
val meta = item.itemMeta val meta = item!!.itemMeta
return meta != null && return meta != null &&
(hasImmutableEnchants(meta) || hasImmutableStoredEnchants(meta)) (hasImmutableEnchants(meta) || hasImmutableStoredEnchants(meta))
} }