From 13acf7ba9d194c5a8a8320d307f1d87e6ef88fbf Mon Sep 17 00:00:00 2001 From: Allink <44676012+allinkdev@users.noreply.github.com> Date: Sun, 5 Jun 2022 21:29:49 +0100 Subject: [PATCH] Properly disable explosions (#45) * Remove unused import * Properly disable explosions --- .../java/dev/plex/listener/impl/BlockListener.java | 1 - .../java/dev/plex/listener/impl/TogglesListener.java | 12 +++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/dev/plex/listener/impl/BlockListener.java b/server/src/main/java/dev/plex/listener/impl/BlockListener.java index e135837..530139c 100644 --- a/server/src/main/java/dev/plex/listener/impl/BlockListener.java +++ b/server/src/main/java/dev/plex/listener/impl/BlockListener.java @@ -13,7 +13,6 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.block.BlockBreakEvent; import org.bukkit.event.block.BlockPlaceEvent; -import org.bukkit.event.block.BlockRedstoneEvent; public class BlockListener extends PlexListener { diff --git a/server/src/main/java/dev/plex/listener/impl/TogglesListener.java b/server/src/main/java/dev/plex/listener/impl/TogglesListener.java index 5924332..17d341d 100644 --- a/server/src/main/java/dev/plex/listener/impl/TogglesListener.java +++ b/server/src/main/java/dev/plex/listener/impl/TogglesListener.java @@ -4,13 +4,23 @@ import dev.plex.listener.PlexListener; import org.bukkit.event.EventHandler; import org.bukkit.event.block.BlockFromToEvent; import org.bukkit.event.block.BlockRedstoneEvent; +import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.entity.ExplosionPrimeEvent; import org.bukkit.event.player.PlayerDropItemEvent; public class TogglesListener extends PlexListener { @EventHandler - public void onEntityExplode(ExplosionPrimeEvent event) + public void onBlockExplode(ExplosionPrimeEvent event) + { + if (!plugin.toggles.getBoolean("explosions")) + { + event.setCancelled(true); + } + } + + @EventHandler + public void onEntityExplode(EntityExplodeEvent event) { if (!plugin.toggles.getBoolean("explosions")) {