From 189ecfe6da130f2919b74883cff6f60dfa1777c7 Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Wed, 20 Mar 2013 01:14:02 -0400 Subject: [PATCH] Add methods to check for conflicting enchantments. Adds BUKKIT-3830 By: GJ --- .../org/bukkit/inventory/meta/EnchantmentStorageMeta.java | 8 ++++++++ .../src/main/java/org/bukkit/inventory/meta/ItemMeta.java | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/paper-api/src/main/java/org/bukkit/inventory/meta/EnchantmentStorageMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/EnchantmentStorageMeta.java index 8822d695e..340087fff 100644 --- a/paper-api/src/main/java/org/bukkit/inventory/meta/EnchantmentStorageMeta.java +++ b/paper-api/src/main/java/org/bukkit/inventory/meta/EnchantmentStorageMeta.java @@ -61,5 +61,13 @@ public interface EnchantmentStorageMeta extends ItemMeta { */ boolean removeStoredEnchant(Enchantment ench) throws IllegalArgumentException; + /** + * Checks if the specified enchantment conflicts with any enchantments in this ItemMeta. + * + * @param ench enchantment to test + * @return true if the enchantment conflicts, false otherwise + */ + boolean hasConflictingStoredEnchant(Enchantment ench); + EnchantmentStorageMeta clone(); } diff --git a/paper-api/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/paper-api/src/main/java/org/bukkit/inventory/meta/ItemMeta.java index 3b0c1559d..3dafdc09f 100644 --- a/paper-api/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/paper-api/src/main/java/org/bukkit/inventory/meta/ItemMeta.java @@ -107,6 +107,14 @@ public interface ItemMeta extends Cloneable, ConfigurationSerializable { */ boolean removeEnchant(Enchantment ench); + /** + * Checks if the specified enchantment conflicts with any enchantments in this ItemMeta. + * + * @param ench enchantment to test + * @return true if the enchantment conflicts, false otherwise + */ + boolean hasConflictingEnchant(Enchantment ench); + @SuppressWarnings("javadoc") ItemMeta clone(); }