From 2eed7303411fd7e46337a61cc2b100f54190a7e7 Mon Sep 17 00:00:00 2001 From: alexcrea Date: Sun, 6 Jul 2025 22:28:02 +0200 Subject: [PATCH] fix not checking excellent enchant enchantments primary and supported items --- .../cuanvil/enchant/wrapped/CAEEV5Enchantment.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CAEEV5Enchantment.java b/src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CAEEV5Enchantment.java index abb73a5..e91930f 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CAEEV5Enchantment.java +++ b/src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CAEEV5Enchantment.java @@ -4,6 +4,7 @@ import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import su.nightexpress.excellentenchants.api.enchantment.CustomEnchantment; +import su.nightexpress.excellentenchants.api.item.ItemSet; import su.nightexpress.excellentenchants.api.wrapper.EnchantDefinition; import xyz.alexcrea.cuanvil.enchant.AdditionalTestEnchantment; import xyz.alexcrea.cuanvil.enchant.CAEnchantment; @@ -39,7 +40,16 @@ public class CAEEV5Enchantment extends CABukkitEnchantment implements Additional @Override public boolean isItemConflict(@NotNull Map enchantments, @NotNull Material itemMat, @NotNull ItemStack item) { - return false; + if (Material.ENCHANTED_BOOK.equals(itemMat)) return false; + + String key = itemMat.getKey().getKey(); + ItemSet primary = eeenchantment.getPrimaryItems(); + if (primary.getMaterials().contains(key)) return false; + + ItemSet supported = eeenchantment.getSupportedItems(); + if (supported.getMaterials().contains(key)) return false; + + return true; } }