Repo-Mirror/EcoEnchants
9
0
Fork 0
Code Issues Releases 1 Activity

Merge pull request #40

Browse Source 
Fix conflict enchantment
This commit is contained in:
Auxilor
2021-03-11 08:43:23 +00:00
committed by GitHub
parent 6b317d678c 7ca0a4fc02
commit 8ca3f4f0a1
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/VillagerListeners.java
View File

@@ -178,6 +178,10 @@ public class VillagerListeners extends PluginDependent implements Listener {
anyConflicts.set(true);
}
if (enchantment.conflictsWith(enchant)) {
anyConflicts.set(true);
}
EcoEnchant ecoEnchant = EcoEnchants.getFromEnchantment(enchant);
if (enchantment.getType().equals(ecoEnchant.getType()) && ecoEnchant.getType().isSingular()) {