From f25e54f3c8ef5ba4c9b9e713b690588676d42e42 Mon Sep 17 00:00:00 2001 From: tastybento Date: Fri, 21 Jan 2022 18:47:31 -0800 Subject: [PATCH] Return void for event listeners https://github.com/BentoBoxWorld/BentoBox/issues/1918 --- .../listeners/flags/protection/FireListener.java | 16 ++++++++++------ .../listeners/flags/protection/TNTListener.java | 7 +++---- .../flags/settings/MobSpawnListener.java | 10 +++++----- .../worldsettings/ObsidianScoopingListener.java | 6 +++--- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/FireListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/FireListener.java index 07322a213..4b465fb18 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/FireListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/FireListener.java @@ -48,8 +48,8 @@ public class FireListener extends FlagListener { * @param e - event */ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) - public boolean onBlockBurn(BlockBurnEvent e) { - return checkFire(e, e.getBlock().getLocation(), Flags.FIRE_BURNING); + public void onBlockBurn(BlockBurnEvent e) { + checkFire(e, e.getBlock().getLocation(), Flags.FIRE_BURNING); } /** @@ -57,8 +57,10 @@ public class FireListener extends FlagListener { * @param e - event */ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) - public boolean onBlockSpread(BlockSpreadEvent e) { - return e.getSource().getType().equals(Material.FIRE) && checkFire(e, e.getBlock().getLocation(), Flags.FIRE_SPREAD); + public void onBlockSpread(BlockSpreadEvent e) { + if (e.getSource().getType().equals(Material.FIRE)) { + checkFire(e, e.getBlock().getLocation(), Flags.FIRE_SPREAD); + } } /** @@ -66,9 +68,11 @@ public class FireListener extends FlagListener { * @param e - event */ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) - public boolean onBlockIgnite(BlockIgniteEvent e) { + public void onBlockIgnite(BlockIgniteEvent e) { // Check if this is a portal lighting - that is allowed any time - return !e.getBlock().getType().equals(Material.OBSIDIAN) && checkFire(e, e.getBlock().getLocation(), Flags.FIRE_IGNITE); + if (!e.getBlock().getType().equals(Material.OBSIDIAN)) { + checkFire(e, e.getBlock().getLocation(), Flags.FIRE_IGNITE); + } } /** diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/TNTListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/TNTListener.java index 9f8ec51c1..d3a3e1e1c 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/TNTListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/TNTListener.java @@ -43,10 +43,10 @@ public class TNTListener extends FlagListener { * @param e - event */ @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) - public boolean onTNTDamage(EntityChangeBlockEvent e) { + public void onTNTDamage(EntityChangeBlockEvent e) { // Check world if (!e.getBlock().getType().equals(Material.TNT) || !getIWM().inWorld(e.getBlock().getLocation())) { - return false; + return; } // Stop TNT from being damaged if it is being caused by a visitor with a flaming arrow if (e.getEntity() instanceof Projectile projectile) { @@ -56,10 +56,9 @@ public class TNTListener extends FlagListener { // Remove the arrow projectile.remove(); e.setCancelled(true); - return true; + return; } } - return false; } /** diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListener.java index 8ae046632..0fbe2d65b 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/settings/MobSpawnListener.java @@ -28,10 +28,10 @@ public class MobSpawnListener extends FlagListener { * @return true if cancelled */ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) - public boolean onMobSpawn(CreatureSpawnEvent e) { + public void onMobSpawn(CreatureSpawnEvent e) { // If not in the right world, or spawning is not natural return if (!getIWM().inWorld(e.getEntity().getLocation())) { - return false; + return; } switch (e.getSpawnReason()) { // Natural @@ -53,14 +53,14 @@ public class MobSpawnListener extends FlagListener { case VILLAGE_INVASION: boolean cancelNatural = shouldCancel(e.getEntity(), e.getLocation(), Flags.ANIMAL_NATURAL_SPAWN, Flags.MONSTER_NATURAL_SPAWN); e.setCancelled(cancelNatural); - return cancelNatural; + return; // Spawners case SPAWNER: boolean cancelSpawners = shouldCancel(e.getEntity(), e.getLocation(), Flags.ANIMAL_SPAWNERS_SPAWN, Flags.MONSTER_SPAWNERS_SPAWN); e.setCancelled(cancelSpawners); - return cancelSpawners; + return; default: - return false; + return; } } diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListener.java index b312edab4..30d1b663f 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/ObsidianScoopingListener.java @@ -36,7 +36,7 @@ public class ObsidianScoopingListener extends FlagListener { * @return false if obsidian not scooped, true if scooped */ @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) - public boolean onPlayerInteract(final PlayerInteractEvent e) { + public void onPlayerInteract(final PlayerInteractEvent e) { if (!getIWM().inWorld(e.getPlayer().getLocation()) || !Flags.OBSIDIAN_SCOOPING.isSetForWorld(e.getPlayer().getWorld()) || !e.getPlayer().getGameMode().equals(GameMode.SURVIVAL) @@ -44,9 +44,9 @@ public class ObsidianScoopingListener extends FlagListener { || !(e.getItem() != null && e.getItem().getType().equals(Material.BUCKET)) || !(e.getClickedBlock() != null && e.getClickedBlock().getType().equals(Material.OBSIDIAN)) || e.getClickedBlock().getRelative(e.getBlockFace()).getType().equals(Material.WATER)) { - return false; + return; } - return lookForLava(e); + lookForLava(e); } private boolean lookForLava(PlayerInteractEvent e) {