diff options
| author | GJ <gjmcferrin@gmail.com> | 2013-03-20 01:14:02 -0400 |
|---|---|---|
| committer | GJ <gjmcferrin@gmail.com> | 2013-03-25 07:55:59 -0400 |
| commit | 1e7bb5a6ea6e54d805762c27c27e61e871bccdfa (patch) | |
| tree | a62a5b3ed3373d96622ce76986e6addf28226f0b /src/main/java/org | |
| parent | d18bdf14e93af640785277582b0f5f50136b3756 (diff) | |
| download | bukkit-1e7bb5a6ea6e54d805762c27c27e61e871bccdfa.tar bukkit-1e7bb5a6ea6e54d805762c27c27e61e871bccdfa.tar.gz bukkit-1e7bb5a6ea6e54d805762c27c27e61e871bccdfa.tar.lz bukkit-1e7bb5a6ea6e54d805762c27c27e61e871bccdfa.tar.xz bukkit-1e7bb5a6ea6e54d805762c27c27e61e871bccdfa.zip | |
Add methods to check for conflicting enchantments. Adds BUKKIT-3830
Diffstat (limited to 'src/main/java/org')
| -rw-r--r-- | src/main/java/org/bukkit/inventory/meta/EnchantmentStorageMeta.java | 8 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/inventory/meta/ItemMeta.java | 8 |
2 files changed, 16 insertions, 0 deletions
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(); } |