From 7c7fd200d21bfc157cd62f19885b81df74722461 Mon Sep 17 00:00:00 2001 From: Intelli Date: Tue, 1 Mar 2022 20:05:13 -0700 Subject: [PATCH] Fixed all listener classes not being final --- .../net/coreprotect/listener/PlayerPickupArrowListener.java | 3 ++- .../net/coreprotect/listener/block/BlockExplodeListener.java | 4 ++-- .../net/coreprotect/listener/block/BlockIgniteListener.java | 4 ++-- .../coreprotect/listener/entity/EntityExplodeListener.java | 3 ++- .../coreprotect/listener/entity/EntityPickupItemListener.java | 4 ++-- .../listener/player/PlayerTakeLecternBookListener.java | 2 +- .../coreprotect/listener/player/ProjectileLaunchListener.java | 4 ++-- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/java/net/coreprotect/listener/PlayerPickupArrowListener.java b/src/main/java/net/coreprotect/listener/PlayerPickupArrowListener.java index c55063d..9c80278 100644 --- a/src/main/java/net/coreprotect/listener/PlayerPickupArrowListener.java +++ b/src/main/java/net/coreprotect/listener/PlayerPickupArrowListener.java @@ -13,9 +13,10 @@ import org.bukkit.potion.PotionData; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionType; +import net.coreprotect.consumer.Queue; import net.coreprotect.listener.entity.EntityPickupItemListener; -public class PlayerPickupArrowListener extends EntityPickupItemListener implements Listener { +public final class PlayerPickupArrowListener extends Queue implements Listener { public static ItemStack getArrowType(AbstractArrow arrow) { ItemStack itemStack = null; diff --git a/src/main/java/net/coreprotect/listener/block/BlockExplodeListener.java b/src/main/java/net/coreprotect/listener/block/BlockExplodeListener.java index 0f7aaa3..859ff0b 100644 --- a/src/main/java/net/coreprotect/listener/block/BlockExplodeListener.java +++ b/src/main/java/net/coreprotect/listener/block/BlockExplodeListener.java @@ -27,9 +27,9 @@ import net.coreprotect.consumer.Queue; import net.coreprotect.database.Database; import net.coreprotect.model.BlockGroup; -public class BlockExplodeListener extends Queue implements Listener { +public final class BlockExplodeListener extends Queue implements Listener { - protected static void processBlockExplode(String user, World world, List blockList) { + public static void processBlockExplode(String user, World world, List blockList) { HashMap blockMap = new HashMap<>(); for (Block block : blockList) { diff --git a/src/main/java/net/coreprotect/listener/block/BlockIgniteListener.java b/src/main/java/net/coreprotect/listener/block/BlockIgniteListener.java index a1e483d..561277c 100644 --- a/src/main/java/net/coreprotect/listener/block/BlockIgniteListener.java +++ b/src/main/java/net/coreprotect/listener/block/BlockIgniteListener.java @@ -25,7 +25,7 @@ import net.coreprotect.model.BlockGroup; import net.coreprotect.thread.CacheHandler; import net.coreprotect.utility.Util; -public final class BlockIgniteListener extends ProjectileLaunchListener implements Listener { +public final class BlockIgniteListener extends Queue implements Listener { @EventHandler(priority = EventPriority.MONITOR) protected void onBlockIgnite(BlockIgniteEvent event) { @@ -128,7 +128,7 @@ public final class BlockIgniteListener extends ProjectileLaunchListener implemen } else { if (event.getCause() == IgniteCause.FIREBALL) { - playerLaunchProjectile(event.getPlayer().getLocation(), event.getPlayer().getName(), new ItemStack(Material.FIRE_CHARGE), 1, -1, 1, ItemLogger.ITEM_THROW); + ProjectileLaunchListener.playerLaunchProjectile(event.getPlayer().getLocation(), event.getPlayer().getName(), new ItemStack(Material.FIRE_CHARGE), 1, -1, 1, ItemLogger.ITEM_THROW); } Player player = event.getPlayer(); diff --git a/src/main/java/net/coreprotect/listener/entity/EntityExplodeListener.java b/src/main/java/net/coreprotect/listener/entity/EntityExplodeListener.java index 3d56de8..c25e92b 100755 --- a/src/main/java/net/coreprotect/listener/entity/EntityExplodeListener.java +++ b/src/main/java/net/coreprotect/listener/entity/EntityExplodeListener.java @@ -16,9 +16,10 @@ import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityExplodeEvent; import net.coreprotect.config.Config; +import net.coreprotect.consumer.Queue; import net.coreprotect.listener.block.BlockExplodeListener; -public final class EntityExplodeListener extends BlockExplodeListener implements Listener { +public final class EntityExplodeListener extends Queue implements Listener { @EventHandler(priority = EventPriority.MONITOR) protected void onEntityExplode(EntityExplodeEvent event) { diff --git a/src/main/java/net/coreprotect/listener/entity/EntityPickupItemListener.java b/src/main/java/net/coreprotect/listener/entity/EntityPickupItemListener.java index 5b9bfa4..9f67969 100644 --- a/src/main/java/net/coreprotect/listener/entity/EntityPickupItemListener.java +++ b/src/main/java/net/coreprotect/listener/entity/EntityPickupItemListener.java @@ -18,9 +18,9 @@ import net.coreprotect.config.Config; import net.coreprotect.config.ConfigHandler; import net.coreprotect.consumer.Queue; -public class EntityPickupItemListener extends Queue implements Listener { +public final class EntityPickupItemListener extends Queue implements Listener { - protected static void onItemPickup(Player player, Location location, ItemStack itemStack) { + public static void onItemPickup(Player player, Location location, ItemStack itemStack) { if (itemStack == null || location == null || !Config.getConfig(location.getWorld()).ITEM_PICKUPS) { return; } diff --git a/src/main/java/net/coreprotect/listener/player/PlayerTakeLecternBookListener.java b/src/main/java/net/coreprotect/listener/player/PlayerTakeLecternBookListener.java index b9feec8..0d1a8f1 100644 --- a/src/main/java/net/coreprotect/listener/player/PlayerTakeLecternBookListener.java +++ b/src/main/java/net/coreprotect/listener/player/PlayerTakeLecternBookListener.java @@ -9,7 +9,7 @@ import org.bukkit.event.player.PlayerTakeLecternBookEvent; import net.coreprotect.config.Config; import net.coreprotect.consumer.Queue; -public class PlayerTakeLecternBookListener extends Queue implements Listener { +public final class PlayerTakeLecternBookListener extends Queue implements Listener { @EventHandler(priority = EventPriority.MONITOR) public void onPlayerTakeLecternBook(PlayerTakeLecternBookEvent event) { diff --git a/src/main/java/net/coreprotect/listener/player/ProjectileLaunchListener.java b/src/main/java/net/coreprotect/listener/player/ProjectileLaunchListener.java index df79d29..ae5d44e 100644 --- a/src/main/java/net/coreprotect/listener/player/ProjectileLaunchListener.java +++ b/src/main/java/net/coreprotect/listener/player/ProjectileLaunchListener.java @@ -30,11 +30,11 @@ import net.coreprotect.database.logger.ItemLogger; import net.coreprotect.listener.PlayerPickupArrowListener; import net.coreprotect.utility.Util; -public class ProjectileLaunchListener extends Queue implements Listener { +public final class ProjectileLaunchListener extends Queue implements Listener { public static Set BOWS = new HashSet<>(Arrays.asList(Material.BOW, Material.CROSSBOW)); - protected static void playerLaunchProjectile(Location location, String user, ItemStack itemStack, int amount, int delay, int offset, int action) { + public static void playerLaunchProjectile(Location location, String user, ItemStack itemStack, int amount, int delay, int offset, int action) { if (!Config.getConfig(location.getWorld()).ITEM_DROPS || itemStack == null) { return; }