From d266444c7d362b98406d05cf49c5be37454c898a Mon Sep 17 00:00:00 2001
From: Heliosares <kyler.t.skeens@gmail.com>
Date: Wed, 17 Jul 2024 21:14:05 -0400
Subject: [PATCH] Update to 1.21

---
 pom.xml                                                   | 8 ++++----
 .../auxprotect/spigot/listeners/EntityListener.java       | 4 ++--
 .../auxprotect/spigot/listeners/PlayerListener.java       | 2 +-
 .../auxprotect/spigot/listeners/ProjectileListener.java   | 7 +++++--
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 920fcf6..d837218 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>AuxProtect</groupId>
     <artifactId>AuxProtect</artifactId>
-    <version>1.3</version>
+    <version>1.3.1</version>
     <name>AuxProtect</name>
     <build>
         <finalName>${project.artifactId}-${project.version}</finalName>
@@ -160,20 +160,20 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.20.4-R0.1-SNAPSHOT</version>
+            <version>1.21-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.20-R0.1-SNAPSHOT</version>
+            <version>1.21-R0.1-SNAPSHOT</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
-            <version>1.20-R0.1-SNAPSHOT</version>
+            <version>1.21-R0.1-SNAPSHOT</version>
             <type>javadoc</type>
             <scope>provided</scope>
         </dependency>
diff --git a/src/main/java/dev/heliosares/auxprotect/spigot/listeners/EntityListener.java b/src/main/java/dev/heliosares/auxprotect/spigot/listeners/EntityListener.java
index 1615e4c..663ee97 100644
--- a/src/main/java/dev/heliosares/auxprotect/spigot/listeners/EntityListener.java
+++ b/src/main/java/dev/heliosares/auxprotect/spigot/listeners/EntityListener.java
@@ -27,8 +27,10 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
+import org.bukkit.event.entity.EntityDismountEvent;
 import org.bukkit.event.entity.EntityDropItemEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
+import org.bukkit.event.entity.EntityMountEvent;
 import org.bukkit.event.entity.EntityPickupItemEvent;
 import org.bukkit.event.entity.EntityResurrectEvent;
 import org.bukkit.event.entity.EntityTameEvent;
@@ -42,8 +44,6 @@ import org.bukkit.inventory.meta.MapMeta;
 import org.bukkit.map.MapRenderer;
 import org.bukkit.projectiles.ProjectileSource;
 import org.bukkit.scheduler.BukkitRunnable;
-import org.spigotmc.event.entity.EntityDismountEvent;
-import org.spigotmc.event.entity.EntityMountEvent;
 
 import java.util.ArrayList;
 
diff --git a/src/main/java/dev/heliosares/auxprotect/spigot/listeners/PlayerListener.java b/src/main/java/dev/heliosares/auxprotect/spigot/listeners/PlayerListener.java
index 75cd7bd..86f583a 100644
--- a/src/main/java/dev/heliosares/auxprotect/spigot/listeners/PlayerListener.java
+++ b/src/main/java/dev/heliosares/auxprotect/spigot/listeners/PlayerListener.java
@@ -354,7 +354,7 @@ public class PlayerListener implements Listener {
             return;
         }
 
-        boolean tether = entity.getLeashHolder().getType() == EntityType.LEASH_HITCH;
+        boolean tether = entity.getLeashHolder().getType().toString().startsWith("LEASH_");
 
         DbEntry entry = new DbEntry(AuxProtectSpigot.getLabel(e.getPlayer()), EntryAction.LEASH, false,
                 e.getEntity().getLocation(), AuxProtectSpigot.getLabel(e.getEntity()), tether ? "was tethered" : "");
diff --git a/src/main/java/dev/heliosares/auxprotect/spigot/listeners/ProjectileListener.java b/src/main/java/dev/heliosares/auxprotect/spigot/listeners/ProjectileListener.java
index 05db829..8ff5253 100644
--- a/src/main/java/dev/heliosares/auxprotect/spigot/listeners/ProjectileListener.java
+++ b/src/main/java/dev/heliosares/auxprotect/spigot/listeners/ProjectileListener.java
@@ -29,11 +29,14 @@ public class ProjectileListener implements Listener {
         this.whitelist = new ArrayList<>();
         whitelist.add(EntityType.ENDER_PEARL);
         whitelist.add(EntityType.TRIDENT);
-        whitelist.add(EntityType.FISHING_HOOK);
         whitelist.add(EntityType.SNOWBALL);
         whitelist.add(EntityType.EGG);
-        whitelist.add(EntityType.SPLASH_POTION);
         whitelist.add(EntityType.ARROW);
+        for (EntityType type : EntityType.values()) {
+            if (type.toString().contains("POTION") || type.toString().contains("FISHING_")) {
+                whitelist.add(type);
+            }
+        }
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)