Added Enchantment.conflictsWith() and EnchantmentTarget.includes(). Addresses BUKKIT-1159 and addresses BUKKIT-1160

2012-03-12 15:33:19 -04:00
parent e783a03aa3
commit e8f00c8fd8
4 changed files with 140 additions and 10 deletions
--- a/src/test/java/org/bukkit/configuration/file/TestEnchantment.java
+++ b/src/test/java/org/bukkit/configuration/file/TestEnchantment.java
@@ -47,4 +47,9 @@ public class TestEnchantment extends Enchantment {
        return true;
    }

+    @Override
+    public boolean conflictsWith(Enchantment other) {
+        return false;
+    }
+
 }