alexcrea/CustomAnvil
1
0
Fork 0
mirror of https://github.com/alexcrea/CustomAnvil.git synced 2026-06-23 16:16:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove getConflictsWithEverything for legacy Eco Enchant

Browse source
This commit is contained in:
alexcrea 2024-12-21 21:14:37 +01:00
parent 1e3b193d46
commit 0c223dd411
No known key found for this signature in database
GPG key ID: 43FD265DB0DBF91F
3 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
impl/LegacyEcoEnchant/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java
View file

@ -11,10 +11,6 @@ import java.util.Set;
*/ */
public class EcoEnchant { public class EcoEnchant {
public boolean getConflictsWithEverything() {
return false;
}
public boolean conflictsWith(@NotNull Enchantment enchant) { public boolean conflictsWith(@NotNull Enchantment enchant) {
return false; return false;
} }

4
src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CAEcoEnchant.java
View file

@ -22,7 +22,8 @@ public class CAEcoEnchant extends CABukkitEnchantment implements AdditionalTestE
@Override @Override
public boolean isEnchantConflict(@NotNull Map<CAEnchantment, Integer> enchantments, @NotNull Material itemMat) { public boolean isEnchantConflict(@NotNull Map<CAEnchantment, Integer> enchantments, @NotNull Material itemMat) {
if(!enchantments.isEmpty()) { if(enchantments.isEmpty()) return false;
if (this.ecoEnchant.getConflictsWithEverything()) { if (this.ecoEnchant.getConflictsWithEverything()) {
return true; return true;
} }
@ -34,7 +35,6 @@ public class CAEcoEnchant extends CABukkitEnchantment implements AdditionalTestE
} }
} }
}
return false; return false;
} }

6
src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CALegacyEcoEnchant.java
View file

@ -23,10 +23,7 @@ public class CALegacyEcoEnchant extends CABukkitEnchantment implements Additiona
@Override @Override
public boolean isEnchantConflict(@NotNull Map<CAEnchantment, Integer> enchantments, @NotNull Material itemMat) { public boolean isEnchantConflict(@NotNull Map<CAEnchantment, Integer> enchantments, @NotNull Material itemMat) {
if (!enchantments.isEmpty()) { if (enchantments.isEmpty()) return false;
if (this.ecoEnchant.getConflictsWithEverything()) {
return true;
}
for (CAEnchantment other : enchantments.keySet()) { for (CAEnchantment other : enchantments.keySet()) {
if (other instanceof CABukkitEnchantment otherVanilla if (other instanceof CABukkitEnchantment otherVanilla
@ -34,7 +31,6 @@ public class CALegacyEcoEnchant extends CABukkitEnchantment implements Additiona
return true; return true;
} }
} }
}
return false; return false;
} }