mirror of
https://github.com/Auxilor/EcoEnchants.git
synced 2024-11-25 15:35:11 +01:00
Merge remote-tracking branch 'origin/master' into master
This commit is contained in:
commit
9560b446eb
@ -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()) {
|
||||
|
Loading…
Reference in New Issue
Block a user