Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2024-12-27 20:37:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

conflictsWith now checks two ways

Browse Source
This commit is contained in:
Auxilor 2021-03-19 16:52:31 +00:00
parent f0a72b5806
commit 699d4b1e98
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java
View File

@ -363,6 +363,9 @@ public abstract class EcoEnchant extends Enchantment implements Listener, Watche
*/ */
@Override @Override
public boolean conflictsWith(@NotNull final Enchantment enchantment) { public boolean conflictsWith(@NotNull final Enchantment enchantment) {
if (enchantment instanceof EcoEnchant) {
return conflicts.contains(enchantment) || ((EcoEnchant) enchantment).conflicts.contains(this);
}
return conflicts.contains(enchantment); return conflicts.contains(enchantment);
} }