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

src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java

@@ -43,4 +43,9 @@ public class EnchantmentWrapper extends Enchantment {
     public String getName() {
         return getEnchantment().getName();
     }
+
+    @Override
+    public boolean conflictsWith(Enchantment other) {
+        return getEnchantment().conflictsWith(other);
+    }
 }