Fix issue #4

Closes #4
Geolykt · Jul 1, 2020 · eddcf5e · eddcf5e
1 parent c5d9633
commit eddcf5e
Show file tree

Hide file tree

Showing 5 changed files with 226 additions and 218 deletions.
diff --git a/Zenchantments/src/main/java/zedly/zenchantments/Config.java b/Zenchantments/src/main/java/zedly/zenchantments/Config.java
@@ -11,6 +11,7 @@
 
 import zedly.zenchantments.enchantments.Spectral;
 import zedly.zenchantments.enums.Tool;
+import zedly.zenchantments.evt.AnvilMerge;
 import zedly.zenchantments.evt.WatcherEnchant;
 
 import java.io.File;

diff --git a/Zenchantments/src/main/java/zedly/zenchantments/CustomEnchantment.java b/Zenchantments/src/main/java/zedly/zenchantments/CustomEnchantment.java
@@ -632,7 +632,7 @@ public Set<Class<? extends CustomEnchantment>> getConflicting() {
         }
 
         public Builder<T> conflicting() {
-
+            customEnchantment.setConflicting(new HashSet<Class<? extends CustomEnchantment>>());
             return this;
         }
 

diff --git a/Zenchantments/src/main/java/zedly/zenchantments/Zenchantments.java b/Zenchantments/src/main/java/zedly/zenchantments/Zenchantments.java
@@ -11,6 +11,7 @@
 import org.bukkit.plugin.java.JavaPlugin;
 import zedly.zenchantments.enchantments.*;
 import zedly.zenchantments.enums.Frequency;
+import zedly.zenchantments.evt.AnvilMerge;
 import zedly.zenchantments.evt.Watcher;
 import zedly.zenchantments.evt.WatcherArrow;
 import zedly.zenchantments.evt.WatcherEnchant;
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             public Builder<T> conflicting() {
+                customEnchantment.setConflicting(new HashSet<Class<? extends CustomEnchantment>>());
                 return this;
             }
@@ Expand Down @@