From 67f275fc78b6bdf0741e43ed73cc02f4c88780e7 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Mon, 12 Mar 2012 15:32:46 -0400
Subject: [PATCH] Implemented Enchantment.conflictsWith(). Addresses
 BUKKIT-1159

By: Celtic Minstrel <celtic.minstrel.ca@some.place>
---
 .../craftbukkit/enchantments/CraftEnchantment.java   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java b/paper-server/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
index e4c68847c..e40c00a8b 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/enchantments/CraftEnchantment.java
+++ b/paper-server/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);
+    }
 }