diff --git a/pom.xml b/pom.xml index 7dec0fb..e4c5968 100644 --- a/pom.xml +++ b/pom.xml @@ -160,13 +160,13 @@ org.spigotmc spigot-api - 1.20.4-R0.1-SNAPSHOT + 1.21-R0.1-SNAPSHOT provided net.md-5 bungeecord-api - 1.20-R0.1-SNAPSHOT + 1.21-R0.1-SNAPSHOT jar provided @@ -180,12 +180,12 @@ org.xerial sqlite-jdbc - 3.42.0.0 + 3.46.0.0 org.json json - 20230227 + 20240303 com.acrobot.chestshop @@ -196,7 +196,7 @@ net.coreprotect coreprotect - 21.3 + 22.4 provided @@ -213,12 +213,12 @@ com.github.Gypopo EconomyShopGUI-API - 1.5.0 + 1.7.1 com.github.7sat DynamicShop3 - 3.15.1 + 3.16.1 provided @@ -230,13 +230,13 @@ net.essentialsx EssentialsX - 2.19.7 + 2.20.1 provided com.palmergames.bukkit.towny towny - 0.100.0.0 + 0.100.3.0 provided 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 ecbb01f..57c9fcd 100644 --- a/src/main/java/dev/heliosares/auxprotect/spigot/listeners/EntityListener.java +++ b/src/main/java/dev/heliosares/auxprotect/spigot/listeners/EntityListener.java @@ -26,8 +26,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; @@ -41,8 +43,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 6cb2507..58e5613 100644 --- a/src/main/java/dev/heliosares/auxprotect/spigot/listeners/PlayerListener.java +++ b/src/main/java/dev/heliosares/auxprotect/spigot/listeners/PlayerListener.java @@ -351,7 +351,7 @@ public class PlayerListener implements Listener { return; } - boolean tether = entity.getLeashHolder().getType() == EntityType.LEASH_HITCH; + boolean tether = entity.getLeashHolder().getType() == EntityType.LEASH_KNOT; 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..3c1ae52 100644 --- a/src/main/java/dev/heliosares/auxprotect/spigot/listeners/ProjectileListener.java +++ b/src/main/java/dev/heliosares/auxprotect/spigot/listeners/ProjectileListener.java @@ -29,10 +29,10 @@ 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.FISHING_BOBBER); whitelist.add(EntityType.SNOWBALL); whitelist.add(EntityType.EGG); - whitelist.add(EntityType.SPLASH_POTION); + whitelist.add(EntityType.POTION); whitelist.add(EntityType.ARROW); }