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

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
commit 8ca3f4f0a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 0 deletions
Show Stats 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); anyConflicts.set(true);
} }
if (enchantment.conflictsWith(enchant)) {
anyConflicts.set(true);
}
EcoEnchant ecoEnchant = EcoEnchants.getFromEnchantment(enchant); EcoEnchant ecoEnchant = EcoEnchants.getFromEnchantment(enchant);
if (enchantment.getType().equals(ecoEnchant.getType()) && ecoEnchant.getType().isSingular()) { if (enchantment.getType().equals(ecoEnchant.getType()) && ecoEnchant.getType().isSingular()) {