From b67d956e3951be1c9a43edc24ba106e7b0ee436a Mon Sep 17 00:00:00 2001 From: alexcrea <42614139+alexcrea@users.noreply.github.com> Date: Thu, 1 May 2025 19:01:16 +0200 Subject: [PATCH] fix inverted equal logic --- .../xyz/alexcrea/cuanvil/enchant/CAEnchantmentRegistry.java | 4 ++-- .../alexcrea/cuanvil/enchant/wrapped/CABukkitEnchantment.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/xyz/alexcrea/cuanvil/enchant/CAEnchantmentRegistry.java b/src/main/java/xyz/alexcrea/cuanvil/enchant/CAEnchantmentRegistry.java index 5e2b1c1..4634a11 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/enchant/CAEnchantmentRegistry.java +++ b/src/main/java/xyz/alexcrea/cuanvil/enchant/CAEnchantmentRegistry.java @@ -76,12 +76,12 @@ public class CAEnchantmentRegistry { */ public boolean register(@NotNull CAEnchantment enchantment) { if (byKeyMap.containsKey(enchantment.getKey())) { - if (!enchantment.equals(byKeyMap.get(enchantment.getKey()))) { + if (Objects.equals(enchantment, byKeyMap.get(enchantment.getKey()))) { // We are trying to register the exact same enchantment. so we just skip it. return false; } - if(ConfigHolder.DEFAULT_CONFIG.getConfig().getBoolean("caution_secret_do_not_log_duplicated_registered_key", false)){ + if (ConfigHolder.DEFAULT_CONFIG.getConfig().getBoolean("caution_secret_do_not_log_duplicated_registered_key", false)) { return false; } diff --git a/src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CABukkitEnchantment.java b/src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CABukkitEnchantment.java index db809ce..1a72458 100644 --- a/src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CABukkitEnchantment.java +++ b/src/main/java/xyz/alexcrea/cuanvil/enchant/wrapped/CABukkitEnchantment.java @@ -18,6 +18,7 @@ import java.lang.reflect.Method; import java.util.HashMap; import java.util.Locale; import java.util.Map; +import java.util.Objects; import java.util.logging.Level; /** @@ -163,7 +164,7 @@ public class CABukkitEnchantment extends CAEnchantmentBase { return false; } - return this.bukkit.equals(other.getEnchant()); + return Objects.equals(this.bukkit, other.getEnchant()); } }