From dbb771bb6522b0b53409c96e7847fca02e336c57 Mon Sep 17 00:00:00 2001 From: tastybento Date: Sat, 9 Mar 2019 00:03:09 -0800 Subject: [PATCH] Remove duplicate method after merging PR --- .../addon/limits/listeners/BlockLimitsListener.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java b/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java index d0ed381..9838f7e 100644 --- a/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java +++ b/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java @@ -10,6 +10,7 @@ import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.Block; +import org.bukkit.block.BlockFace; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.event.Cancellable; import org.bukkit.event.EventHandler; @@ -20,6 +21,7 @@ import org.bukkit.event.block.BlockBurnEvent; import org.bukkit.event.block.BlockExplodeEvent; import org.bukkit.event.block.BlockFadeEvent; import org.bukkit.event.block.BlockFormEvent; +import org.bukkit.event.block.BlockFromToEvent; import org.bukkit.event.block.BlockGrowEvent; import org.bukkit.event.block.BlockMultiPlaceEvent; import org.bukkit.event.block.BlockPlaceEvent; @@ -28,11 +30,9 @@ import org.bukkit.event.block.EntityBlockFormEvent; import org.bukkit.event.block.LeavesDecayEvent; import org.bukkit.event.entity.EntityChangeBlockEvent; import org.bukkit.event.entity.EntityExplodeEvent; -import org.bukkit.event.block.BlockFromToEvent; import bentobox.addon.limits.Limits; import bentobox.addon.limits.objects.IslandBlockCount; -import org.bukkit.block.BlockFace; import world.bentobox.bentobox.api.events.island.IslandEvent.IslandDeleteEvent; import world.bentobox.bentobox.api.localization.TextVariables; import world.bentobox.bentobox.api.user.User; @@ -225,15 +225,6 @@ public class BlockLimitsListener implements Listener { public void onBlock(EntityChangeBlockEvent e) { process(e.getBlock(), false); } - - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onBlock(BlockFromToEvent e) { - if (e.getBlock().isLiquid()){ - if (e.getToBlock().getType() == Material.REDSTONE_WIRE || e.getToBlock().getType() == Material.REPEATER || e.getToBlock().getType() == Material.COMPARATOR || e.getToBlock().getType() == Material.REDSTONE_TORCH) { - process(e.getToBlock(), false); - } - } - } @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onBlock(BlockFromToEvent e) {