From 7e828a42b0d3214efa03543e604d95a0b5ce6f7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A4seToatz?= Date: Sat, 23 Aug 2025 00:11:48 +0200 Subject: [PATCH] Fix duplicate enchants --- build.gradle | 4 ++-- src/main/java/com/kasetoatz/superArmor/SuperArmor.java | 6 ++++++ src/main/resources/plugin.yml | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index bf58ecc..a32861b 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'com.kasetoatz' -version = '1.0' +version = '1.2' repositories { mavenCentral() @@ -23,7 +23,7 @@ tasks { // Configure the Minecraft version for our task. // This is the only required configuration besides applying the plugin. // Your plugin's jar (or shadowJar if present) will be used automatically. - minecraftVersion("1.21") + minecraftVersion("1.21.8") } } diff --git a/src/main/java/com/kasetoatz/superArmor/SuperArmor.java b/src/main/java/com/kasetoatz/superArmor/SuperArmor.java index a061597..537a180 100644 --- a/src/main/java/com/kasetoatz/superArmor/SuperArmor.java +++ b/src/main/java/com/kasetoatz/superArmor/SuperArmor.java @@ -15,6 +15,8 @@ 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.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import static com.kasetoatz.superArmor.Multiplier.multipliers; @@ -128,6 +130,10 @@ public final class SuperArmor 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 0689420..6dd0f56 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,4 +1,4 @@ name: SuperArmor -version: '1.1' +version: '1.2' main: com.kasetoatz.superArmor.SuperArmor api-version: '1.21'