From e62949e132611fcfa02c02bcd833b09c426ede6f Mon Sep 17 00:00:00 2001
From: Cazcez <cazcez@protonmail.com>
Date: Sat, 25 Feb 2023 18:43:24 +0300
Subject: [PATCH] Fixes DISABLE_LOYALTY_PORTALS doesn't work

---
 src/main/java/de/jeff_media/bettertridents/Main.java          | 1 +
 .../jeff_media/bettertridents/listeners/PortalListener.java   | 4 ++--
 .../de/jeff_media/bettertridents/utils/EnchantmentUtils.java  | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/de/jeff_media/bettertridents/Main.java b/src/main/java/de/jeff_media/bettertridents/Main.java
index d1068a4..3636e47 100644
--- a/src/main/java/de/jeff_media/bettertridents/Main.java
+++ b/src/main/java/de/jeff_media/bettertridents/Main.java
@@ -44,6 +44,7 @@ public class Main extends JavaPlugin {
         Bukkit.getPluginManager().registerEvents(new ImpalingListener(), this);
         Bukkit.getPluginManager().registerEvents(new OffhandListener(), this);
         Bukkit.getPluginManager().registerEvents(new TridentThrowListener(), this);
+        Bukkit.getPluginManager().registerEvents(new PortalListener(), this);
         getCommand("bettertridents").setExecutor(new ReloadCommand());
         @SuppressWarnings("unused") Metrics metrics = new Metrics(this, 11460);
     }
diff --git a/src/main/java/de/jeff_media/bettertridents/listeners/PortalListener.java b/src/main/java/de/jeff_media/bettertridents/listeners/PortalListener.java
index 0f2286f..46f3689 100644
--- a/src/main/java/de/jeff_media/bettertridents/listeners/PortalListener.java
+++ b/src/main/java/de/jeff_media/bettertridents/listeners/PortalListener.java
@@ -19,8 +19,8 @@ public class PortalListener implements Listener {
         if(!main.getConfig().getBoolean(Config.DISABLE_LOYALTY_PORTALS)) return;
         if(event.getEntityType() != EntityType.TRIDENT) return;
         Trident trident = (Trident) event.getEntity();
-        if(EnchantmentUtils.getLoyalty(trident)>0) {
-            main.debug("Prevented loyalty trident from travelling through portqal");
+        if(EnchantmentUtils.getLoyalty(trident)) {
+            main.debug("Prevented loyalty trident from travelling through portal");
             event.setCancelled(true);
         }
     }
diff --git a/src/main/java/de/jeff_media/bettertridents/utils/EnchantmentUtils.java b/src/main/java/de/jeff_media/bettertridents/utils/EnchantmentUtils.java
index e977cef..dc8b763 100644
--- a/src/main/java/de/jeff_media/bettertridents/utils/EnchantmentUtils.java
+++ b/src/main/java/de/jeff_media/bettertridents/utils/EnchantmentUtils.java
@@ -34,8 +34,8 @@ public class EnchantmentUtils {
         trident.getPersistentDataContainer().set(Main.IMPALING_TAG, PersistentDataType.INTEGER, level);
     }
 
-    public static int getLoyalty(Trident trident) {
-        return trident.getPersistentDataContainer().getOrDefault(Main.LOYALTY_TAG, PersistentDataType.INTEGER, 0);
+    public static boolean getLoyalty(Trident trident) {
+        return trident.getItem().getEnchantments().containsKey(Enchantment.LOYALTY);
     }
 
     public static void registerLoyalty(Trident trident, int level) {