From e30b8961630b6355032748ecf44df2fc0a512494 Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@some.place>
Date: Mon, 12 Mar 2012 15:33:19 -0400
Subject: Added Enchantment.conflictsWith() and EnchantmentTarget.includes().
 Addresses BUKKIT-1159 and addresses BUKKIT-1160

---
 src/test/java/org/bukkit/configuration/file/TestEnchantment.java | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/test')

diff --git a/src/test/java/org/bukkit/configuration/file/TestEnchantment.java b/src/test/java/org/bukkit/configuration/file/TestEnchantment.java
index ac3ec871..93569721 100644
--- 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;
+    }
+
 }
-- 
cgit v1.2.3