alexcrea/CustomAnvil
1
0
Fork 0
mirror of https://github.com/alexcrea/CustomAnvil.git synced 2026-06-23 16:16:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'v1.x.x' into v2.x.x-merging

Browse source 
# Conflicts:
#	src/main/kotlin/xyz/alexcrea/cuanvil/listener/PrepareAnvilListener.kt
This commit is contained in:
alexcrea 2025-12-30 02:18:54 +01:00
commit 286446336f
Signed by: alexcrea
GPG key ID: E346CD16413450E3
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/kotlin/xyz/alexcrea/cuanvil/listener/PrepareAnvilListener.kt
View file

@ -87,10 +87,9 @@ class PrepareAnvilListener : Listener {
doRenaming(event, view, player, first) doRenaming(event, view, 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, view, player, first, second) doMerge(event, view, 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))
} }