diff --git a/pom.xml b/pom.xml index f0380e7..b4e2bc5 100644 --- a/pom.xml +++ b/pom.xml @@ -98,10 +98,6 @@ - - my-local-repo - file://${basedir}/src/main/resources/jars - spigot-repo https://hub.spigotmc.org/nexus/content/repositories/snapshots @@ -149,13 +145,6 @@ ${bentobox.version} provided - - - com.songoda - EpicSpawners-API - 6.0.9 - provided - diff --git a/src/main/java/bentobox/addon/limits/Limits.java b/src/main/java/bentobox/addon/limits/Limits.java index a2b62ed..8064fef 100644 --- a/src/main/java/bentobox/addon/limits/Limits.java +++ b/src/main/java/bentobox/addon/limits/Limits.java @@ -3,14 +3,12 @@ package bentobox.addon.limits; import java.util.List; import java.util.stream.Collectors; -import org.bukkit.Bukkit; import org.bukkit.World; import bentobox.addon.limits.commands.AdminCommand; import bentobox.addon.limits.commands.PlayerCommand; import bentobox.addon.limits.listeners.BlockLimitsListener; import bentobox.addon.limits.listeners.EntityLimitListener; -import bentobox.addon.limits.listeners.EpicSpawnersListener; import bentobox.addon.limits.listeners.JoinListener; import world.bentobox.bentobox.api.addons.Addon; import world.bentobox.bentobox.api.addons.GameModeAddon; @@ -57,12 +55,6 @@ public class Limits extends Addon { registerListener(blockLimitListener); registerListener(new JoinListener(this)); registerListener(new EntityLimitListener(this)); - // Register epic spawners one tick after load - Bukkit.getScheduler().runTask(getPlugin(), () -> { - if (Bukkit.getServer().getPluginManager().getPlugin("EpicSpawners") != null) { - registerListener(new EpicSpawnersListener(this)); - } - }); // Done } diff --git a/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java b/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java index c932a98..e42799d 100644 --- a/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java +++ b/src/main/java/bentobox/addon/limits/listeners/BlockLimitsListener.java @@ -136,12 +136,12 @@ public class BlockLimitsListener implements Listener { } // Player-related events - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = false) public void onBlock(BlockPlaceEvent e) { notify(e, User.getInstance(e.getPlayer()), process(e.getBlock(), true), e.getBlock().getType()); } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = false) public void onBlock(BlockBreakEvent e) { handleBreak(e, e.getPlayer(), e.getBlock()); } @@ -166,7 +166,7 @@ public class BlockLimitsListener implements Listener { } } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onBlock(BlockMultiPlaceEvent e) { notify(e, User.getInstance(e.getPlayer()), process(e.getBlock(), true), e.getBlock().getType()); } @@ -181,57 +181,57 @@ public class BlockLimitsListener implements Listener { } // Non-player events - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onBlock(BlockBurnEvent e) { process(e.getBlock(), false); } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onBlock(BlockExplodeEvent e) { e.blockList().forEach(b -> process(b, false)); } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onBlock(BlockFadeEvent e) { process(e.getBlock(), false); } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onBlock(BlockFormEvent e) { process(e.getBlock(), true); } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onBlock(BlockGrowEvent e) { process(e.getBlock(), true); } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onBlock(BlockSpreadEvent e) { process(e.getBlock(), true); } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onBlock(EntityBlockFormEvent e) { process(e.getBlock(), true); } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onBlock(LeavesDecayEvent e) { process(e.getBlock(), false); } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onBlock(EntityExplodeEvent e) { e.blockList().forEach(b -> process(b, false)); } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onBlock(EntityChangeBlockEvent e) { process(e.getBlock(), false); } - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.NORMAL, 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 || e.getToBlock().getType() == Material.REDSTONE_WALL_TORCH) { @@ -361,7 +361,7 @@ public class BlockLimitsListener implements Listener { * * @param e - island delete event */ - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) + @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) public void onIslandDelete(IslandDeleteEvent e) { islandCountMap.remove(e.getIsland().getUniqueId()); saveMap.remove(e.getIsland().getUniqueId()); diff --git a/src/main/java/bentobox/addon/limits/listeners/EpicSpawnersListener.java b/src/main/java/bentobox/addon/limits/listeners/EpicSpawnersListener.java deleted file mode 100644 index 9d22c5d..0000000 --- a/src/main/java/bentobox/addon/limits/listeners/EpicSpawnersListener.java +++ /dev/null @@ -1,33 +0,0 @@ -package bentobox.addon.limits.listeners; - -import org.bukkit.block.Block; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; - -import com.songoda.epicspawners.api.events.SpawnerBreakEvent; - -import bentobox.addon.limits.Limits; - -/** - * @author tastybento - * - */ -public class EpicSpawnersListener implements Listener { - - Limits addon; - - /** - * @param addon - */ - public EpicSpawnersListener(Limits addon) { - this.addon = addon; - } - - @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) - public void onBlockBreak(SpawnerBreakEvent e) { - Block b = e.getSpawner().getLocation().getBlock(); - addon.getBlockLimitListener().handleBreak(e, e.getPlayer(), b); - } - -} diff --git a/src/main/resources/jars/com/songoda/EpicSpawners-API/6.0.9/EpicSpawners-API-6.0.9.jar b/src/main/resources/jars/com/songoda/EpicSpawners-API/6.0.9/EpicSpawners-API-6.0.9.jar deleted file mode 100644 index 79d608f..0000000 Binary files a/src/main/resources/jars/com/songoda/EpicSpawners-API/6.0.9/EpicSpawners-API-6.0.9.jar and /dev/null differ diff --git a/src/main/resources/jars/com/songoda/EpicSpawners-API/6.0.9/EpicSpawners-API-6.0.9.pom b/src/main/resources/jars/com/songoda/EpicSpawners-API/6.0.9/EpicSpawners-API-6.0.9.pom deleted file mode 100644 index 1959e25..0000000 --- a/src/main/resources/jars/com/songoda/EpicSpawners-API/6.0.9/EpicSpawners-API-6.0.9.pom +++ /dev/null @@ -1,9 +0,0 @@ - - - 4.0.0 - com.songoda - EpicSpawners-API - 6.0.9 - POM was created from install:install-file - diff --git a/src/main/resources/jars/com/songoda/EpicSpawners-API/maven-metadata-local.xml b/src/main/resources/jars/com/songoda/EpicSpawners-API/maven-metadata-local.xml deleted file mode 100644 index 242ce34..0000000 --- a/src/main/resources/jars/com/songoda/EpicSpawners-API/maven-metadata-local.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - com.songoda - EpicSpawners-API - - 6.0.9 - - 6.0.9 - - 20190815012640 - -