From 5fe6074150e08a5d5d7d952364a38e17d0638f0e Mon Sep 17 00:00:00 2001 From: Ammo Date: Thu, 4 Jul 2024 18:04:10 +0200 Subject: [PATCH 1/5] chore: Bump plugin version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 920fcf6..7dec0fb 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 AuxProtect AuxProtect - 1.3 + 1.4 AuxProtect ${project.artifactId}-${project.version} From dc17b2ad086f25a605e0d015de506c77052487e5 Mon Sep 17 00:00:00 2001 From: Ammo Date: Thu, 4 Jul 2024 18:16:14 +0200 Subject: [PATCH 2/5] chore: Bump dependency versions ans spigot to 1.21 --- pom.xml | 18 +++++++++--------- .../spigot/listeners/EntityListener.java | 4 ++-- .../spigot/listeners/PlayerListener.java | 2 +- .../spigot/listeners/ProjectileListener.java | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) 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); } From c6aa8da8565d48651fadc0cd2214e1514fff7965 Mon Sep 17 00:00:00 2001 From: Ammo Date: Thu, 4 Jul 2024 18:22:29 +0200 Subject: [PATCH 3/5] fix: Fixed NPE where null inventory is being inserted into the log function. Fixes #25 --- .../spigot/listeners/InventoryListener.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/dev/heliosares/auxprotect/spigot/listeners/InventoryListener.java b/src/main/java/dev/heliosares/auxprotect/spigot/listeners/InventoryListener.java index 9a05047..1d45f32 100644 --- a/src/main/java/dev/heliosares/auxprotect/spigot/listeners/InventoryListener.java +++ b/src/main/java/dev/heliosares/auxprotect/spigot/listeners/InventoryListener.java @@ -14,7 +14,12 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.enchantment.EnchantItemEvent; -import org.bukkit.event.inventory.*; +import org.bukkit.event.inventory.ClickType; +import org.bukkit.event.inventory.CraftItemEvent; +import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.event.inventory.InventoryCloseEvent; +import org.bukkit.event.inventory.InventoryOpenEvent; +import org.bukkit.event.inventory.InventoryType; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; @@ -39,6 +44,10 @@ public class InventoryListener implements Listener { } private void log(HumanEntity player, Inventory inv, boolean state) { + if(inv == null) { + return; + } + int count = 0; for (ItemStack item : inv.getContents()) { if (item == null) From 5649fa034f16be82a47f08bd297b4e3075e448d6 Mon Sep 17 00:00:00 2001 From: Heliosares Date: Wed, 17 Jul 2024 21:46:57 -0400 Subject: [PATCH 4/5] Revert "chore: Bump plugin version" This reverts commit 5fe6074150e08a5d5d7d952364a38e17d0638f0e. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e4c5968..e308725 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 AuxProtect AuxProtect - 1.4 + 1.3 AuxProtect ${project.artifactId}-${project.version} From a694cf6b59ab21a982d994463945f004653c1eed Mon Sep 17 00:00:00 2001 From: Heliosares Date: Wed, 17 Jul 2024 21:47:06 -0400 Subject: [PATCH 5/5] Revert "chore: Bump dependency versions ans spigot to 1.21" This reverts commit dc17b2ad086f25a605e0d015de506c77052487e5. --- pom.xml | 18 +++++++++--------- .../spigot/listeners/EntityListener.java | 4 ++-- .../spigot/listeners/PlayerListener.java | 2 +- .../spigot/listeners/ProjectileListener.java | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index e308725..920fcf6 100644 --- a/pom.xml +++ b/pom.xml @@ -160,13 +160,13 @@ org.spigotmc spigot-api - 1.21-R0.1-SNAPSHOT + 1.20.4-R0.1-SNAPSHOT provided net.md-5 bungeecord-api - 1.21-R0.1-SNAPSHOT + 1.20-R0.1-SNAPSHOT jar provided @@ -180,12 +180,12 @@ org.xerial sqlite-jdbc - 3.46.0.0 + 3.42.0.0 org.json json - 20240303 + 20230227 com.acrobot.chestshop @@ -196,7 +196,7 @@ net.coreprotect coreprotect - 22.4 + 21.3 provided @@ -213,12 +213,12 @@ com.github.Gypopo EconomyShopGUI-API - 1.7.1 + 1.5.0 com.github.7sat DynamicShop3 - 3.16.1 + 3.15.1 provided @@ -230,13 +230,13 @@ net.essentialsx EssentialsX - 2.20.1 + 2.19.7 provided com.palmergames.bukkit.towny towny - 0.100.3.0 + 0.100.0.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 57c9fcd..ecbb01f 100644 --- a/src/main/java/dev/heliosares/auxprotect/spigot/listeners/EntityListener.java +++ b/src/main/java/dev/heliosares/auxprotect/spigot/listeners/EntityListener.java @@ -26,10 +26,8 @@ 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; @@ -43,6 +41,8 @@ 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 58e5613..6cb2507 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_KNOT; + boolean tether = entity.getLeashHolder().getType() == EntityType.LEASH_HITCH; 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 3c1ae52..05db829 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_BOBBER); + whitelist.add(EntityType.FISHING_HOOK); whitelist.add(EntityType.SNOWBALL); whitelist.add(EntityType.EGG); - whitelist.add(EntityType.POTION); + whitelist.add(EntityType.SPLASH_POTION); whitelist.add(EntityType.ARROW); }