From 1e7bb5a6ea6e54d805762c27c27e61e871bccdfa Mon Sep 17 00:00:00 2001 From: GJ Date: Wed, 20 Mar 2013 01:14:02 -0400 Subject: Add methods to check for conflicting enchantments. Adds BUKKIT-3830 --- .../java/org/bukkit/inventory/meta/EnchantmentStorageMeta.java | 8 ++++++++ src/main/java/org/bukkit/inventory/meta/ItemMeta.java | 8 ++++++++ 2 files changed, 16 insertions(+) (limited to 'src/main/java/org') diff --git a/src/main/java/org/bukkit/inventory/meta/EnchantmentStorageMeta.java b/src/main/java/org/bukkit/inventory/meta/EnchantmentStorageMeta.java index 8822d695..340087ff 100644 --- a/src/main/java/org/bukkit/inventory/meta/EnchantmentStorageMeta.java +++ b/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/src/main/java/org/bukkit/inventory/meta/ItemMeta.java b/src/main/java/org/bukkit/inventory/meta/ItemMeta.java index 3b0c1559..3dafdc09 100644 --- a/src/main/java/org/bukkit/inventory/meta/ItemMeta.java +++ b/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(); } -- cgit v1.2.3