From f219f0efe95c3a62b66a920303e65812e4b3c052 Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@some.place>
Date: Mon, 12 Mar 2012 15:32:46 -0400
Subject: Implemented Enchantment.conflictsWith(). Addresses BUKKIT-1159

---
 .../bukkit/craftbukkit/enchantments/CraftEnchantment.java    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
index e4c68847..e40c00a8 100644
--- a/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
+++ b/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
@@ -116,4 +116,16 @@ public class CraftEnchantment extends Enchantment {
 
         return null;
     }
+
+    @Override
+    public boolean conflictsWith(Enchantment other) {
+        if (other instanceof EnchantmentWrapper) {
+            other = ((EnchantmentWrapper) other).getEnchantment();
+        }
+        if (!(other instanceof CraftEnchantment)) {
+            return false;
+        }
+        CraftEnchantment ench = (CraftEnchantment) other;
+        return !target.a(ench.target);
+    }
 }
-- 
cgit v1.2.3