From 6221631dab872e4f38eb7407909d4420b45ef3aa Mon Sep 17 00:00:00 2001 From: Len <40720638+destro174@users.noreply.github.com> Date: Mon, 22 Aug 2022 19:15:40 +0200 Subject: [PATCH] Add missing return in EventListeners --- .../java/com/alttd/playershops/listener/PlayerListener.java | 6 ++++++ .../java/com/alttd/playershops/listener/ShopListener.java | 3 ++- .../com/alttd/playershops/listener/TransactionListener.java | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/alttd/playershops/listener/PlayerListener.java b/src/main/java/com/alttd/playershops/listener/PlayerListener.java index 49a053f..f72ad08 100644 --- a/src/main/java/com/alttd/playershops/listener/PlayerListener.java +++ b/src/main/java/com/alttd/playershops/listener/PlayerListener.java @@ -65,6 +65,9 @@ public class PlayerListener extends EventListener { @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST) public void onSignChange(SignChangeEvent event) { + if(!this.isRegistered) + return; + Block block = event.getBlock(); if (!(block.getState() instanceof Sign)) return; @@ -77,6 +80,9 @@ public class PlayerListener extends EventListener { @EventHandler(ignoreCancelled = true, priority = EventPriority.HIGHEST) public void onShopCreation(SignChangeEvent event) { + if(!this.isRegistered) + return; + Block b = event.getBlock(); Player player = event.getPlayer(); if (!(b.getState() instanceof Sign)) diff --git a/src/main/java/com/alttd/playershops/listener/ShopListener.java b/src/main/java/com/alttd/playershops/listener/ShopListener.java index 6a48f34..524d0ef 100644 --- a/src/main/java/com/alttd/playershops/listener/ShopListener.java +++ b/src/main/java/com/alttd/playershops/listener/ShopListener.java @@ -24,7 +24,8 @@ public class ShopListener extends EventListener { @EventHandler(ignoreCancelled = true) public void onEntityExplosion(EntityExplodeEvent event) { - if(!this.isRegistered) return; + if(!this.isRegistered) + return; // This might be heavy when tnt is chained, would it be better to expand the unbreakable block api in galaxy and use that? // No need for slow bukkit events eating up cpu and memory Iterator blockIterator = event.blockList().iterator(); diff --git a/src/main/java/com/alttd/playershops/listener/TransactionListener.java b/src/main/java/com/alttd/playershops/listener/TransactionListener.java index af4b39d..7056dc0 100644 --- a/src/main/java/com/alttd/playershops/listener/TransactionListener.java +++ b/src/main/java/com/alttd/playershops/listener/TransactionListener.java @@ -32,6 +32,9 @@ public class TransactionListener extends EventListener { @EventHandler(ignoreCancelled = true) public void onShopSignClick(PlayerInteractEvent event) { + if(!this.isRegistered) + return; + if (event.getHand() == EquipmentSlot.OFF_HAND) { return; }