mirror of
https://github.com/Auxilor/EcoEnchants.git
synced 2024-12-24 20:07:34 +01:00
Merge remote-tracking branch 'origin/master'
# Conflicts: # gradle.properties
This commit is contained in:
commit
b65ecc4e29
@ -23,7 +23,7 @@ public class EcoCraftEnchantment extends CraftEnchantment {
|
||||
|
||||
@Override
|
||||
public boolean conflictsWith(@NotNull final org.bukkit.enchantments.Enchantment other) {
|
||||
return EcoEnchants.getFromEnchantment(other) == null ? super.conflictsWith(other) : other.conflictsWith(other);
|
||||
return EcoEnchants.getFromEnchantment(other) == null ? super.conflictsWith(other) : other.conflictsWith(this);
|
||||
}
|
||||
|
||||
public void register() {
|
||||
|
@ -23,7 +23,7 @@ public class EcoCraftEnchantment extends CraftEnchantment {
|
||||
|
||||
@Override
|
||||
public boolean conflictsWith(@NotNull final org.bukkit.enchantments.Enchantment other) {
|
||||
return EcoEnchants.getFromEnchantment(other) == null ? super.conflictsWith(other) : other.conflictsWith(other);
|
||||
return EcoEnchants.getFromEnchantment(other) == null ? super.conflictsWith(other) : other.conflictsWith(this);
|
||||
}
|
||||
|
||||
public void register() {
|
||||
|
@ -23,7 +23,7 @@ public class EcoCraftEnchantment extends CraftEnchantment {
|
||||
|
||||
@Override
|
||||
public boolean conflictsWith(@NotNull final org.bukkit.enchantments.Enchantment other) {
|
||||
return EcoEnchants.getFromEnchantment(other) == null ? super.conflictsWith(other) : other.conflictsWith(other);
|
||||
return EcoEnchants.getFromEnchantment(other) == null ? super.conflictsWith(other) : other.conflictsWith(this);
|
||||
}
|
||||
|
||||
public void register() {
|
||||
|
@ -23,7 +23,7 @@ public class EcoCraftEnchantment extends CraftEnchantment {
|
||||
|
||||
@Override
|
||||
public boolean conflictsWith(@NotNull final org.bukkit.enchantments.Enchantment other) {
|
||||
return EcoEnchants.getFromEnchantment(other) == null ? super.conflictsWith(other) : other.conflictsWith(other);
|
||||
return EcoEnchants.getFromEnchantment(other) == null ? super.conflictsWith(other) : other.conflictsWith(this);
|
||||
}
|
||||
|
||||
public void register() {
|
||||
|
Loading…
Reference in New Issue
Block a user