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

better merge item change check (#78)

Browse source 
try to fix a weird issue with an user
This commit is contained in:
alexcrea 2025-07-16 16:54:59 +02:00 • committed by GitHub
commit 494f48b9fc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,7 @@ import org.bukkit.inventory.ItemStack
import org.bukkit.inventory.meta.EnchantmentStorageMeta import org.bukkit.inventory.meta.EnchantmentStorageMeta
import org.bukkit.inventory.meta.ItemMeta import org.bukkit.inventory.meta.ItemMeta
import xyz.alexcrea.cuanvil.dependency.DependencyManager import xyz.alexcrea.cuanvil.dependency.DependencyManager
import xyz.alexcrea.cuanvil.enchant.CAEnchantment
import xyz.alexcrea.cuanvil.util.* import xyz.alexcrea.cuanvil.util.*
import xyz.alexcrea.cuanvil.util.UnitRepairUtil.getRepair import xyz.alexcrea.cuanvil.util.UnitRepairUtil.getRepair
import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.atomic.AtomicInteger
@ -232,20 +233,26 @@ class PrepareAnvilListener : Listener {
) { ) {
val newEnchants = first.findEnchantments() val newEnchants = first.findEnchantments()
.combineWith(second.findEnchantments(), first, player) .combineWith(second.findEnchantments(), first, player)
val resultItem = first.clone() var hasChanged = !isIdentical(first.findEnchantments(), newEnchants);
resultItem.setEnchantmentsUnsafe(newEnchants)
val resultItem = first.clone()
var anvilCost = 0;
if(hasChanged){
resultItem.setEnchantmentsUnsafe(newEnchants)
// Calculate enchantment cost
anvilCost+= AnvilXpUtil.getRightValues(second, resultItem)
}
// Calculate enchantment cost
var anvilCost = AnvilXpUtil.getRightValues(second, resultItem)
// Calculate repair cost // Calculate repair cost
if (!first.isEnchantedBook() && !second.isEnchantedBook()) { if (!first.isEnchantedBook() && !second.isEnchantedBook()) {
// we only need to be concerned with repair when neither item is a book // we only need to be concerned with repair when neither item is a book
val repaired = resultItem.repairFrom(first, second) val repaired = resultItem.repairFrom(first, second)
anvilCost += if (repaired) ConfigOptions.itemRepairCost else 0 anvilCost += if (repaired) ConfigOptions.itemRepairCost else 0
hasChanged = hasChanged || repaired;
} }
// Test/stop if nothing changed. // Test/stop if nothing changed.
if (first == resultItem) { if (!hasChanged) {
CustomAnvil.log("Mergable with second, But input is same as output") CustomAnvil.log("Mergable with second, But input is same as output")
event.result = null event.result = null
return return
@ -265,6 +272,18 @@ class PrepareAnvilListener : Listener {
AnvilXpUtil.setAnvilInvXp(inventory, event.view, player, finalResult.levelCost) AnvilXpUtil.setAnvilInvXp(inventory, event.view, player, finalResult.levelCost)
} }
private fun isIdentical(
firstEnchants: MutableMap<CAEnchantment, Int>,
resultEnchants: MutableMap<CAEnchantment, Int>
): Boolean {
if(firstEnchants.size != resultEnchants.size) return false
for (entry in resultEnchants) {
if(firstEnchants.getOrDefault(entry.key, entry.value-1) != entry.value) return false
}
return true
}
// return true if there is a valid unit repair with these ingredients // return true if there is a valid unit repair with these ingredients
private fun testUnitRepair( private fun testUnitRepair(
event: PrepareAnvilEvent, inventory: AnvilInventory, player: HumanEntity, event: PrepareAnvilEvent, inventory: AnvilInventory, player: HumanEntity,