From 237c200966cf8e23a11beb93fe38e2fc3b13813c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A4seToatz?= Date: Sat, 23 Aug 2025 00:16:19 +0200 Subject: [PATCH] Fix duplicate enchants --- build.gradle | 2 +- src/main/java/com/kasetoatz/superTools/SuperTools.java | 5 +++++ src/main/resources/plugin.yml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 183a50d..f512889 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'com.kasetoatz' -version = '1.0' +version = '1.1' repositories { mavenCentral() diff --git a/src/main/java/com/kasetoatz/superTools/SuperTools.java b/src/main/java/com/kasetoatz/superTools/SuperTools.java index d0a397d..6c6537b 100644 --- a/src/main/java/com/kasetoatz/superTools/SuperTools.java +++ b/src/main/java/com/kasetoatz/superTools/SuperTools.java @@ -15,6 +15,7 @@ import org.bukkit.inventory.view.AnvilView; import org.bukkit.plugin.java.JavaPlugin; import java.util.Map; +import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; import static com.kasetoatz.superArmor.Multiplier.multipliers; @@ -126,6 +127,10 @@ public final class SuperTools extends JavaPlugin implements Listener getEnchants(right).forEach((enchant, level) -> { if (isValidEnchant(left, enchant)) { + if (Objects.equals(getEnchants(left).getOrDefault(enchant, -1), level)) + { + level = Math.min(enchant.getMaxLevel(), level + 1); + } if (result.getItemMeta() instanceof EnchantmentStorageMeta meta) { meta.addStoredEnchant(enchant, level, true); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 20cf95f..494564c 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,4 +1,4 @@ name: SuperTools -version: '1.0' +version: '1.1' main: com.kasetoatz.superTools.SuperTools api-version: '1.21'