diff --git a/arenaregen/src/main/java/me/realized/de/arenaregen/zone/ZoneListener.java b/arenaregen/src/main/java/me/realized/de/arenaregen/zone/ZoneListener.java index 86b5deb..10dc003 100644 --- a/arenaregen/src/main/java/me/realized/de/arenaregen/zone/ZoneListener.java +++ b/arenaregen/src/main/java/me/realized/de/arenaregen/zone/ZoneListener.java @@ -38,6 +38,8 @@ public ZoneListener(final ArenaRegen extension, final ZoneManager zoneManager) { this.config = extension.getConfiguration(); this.lang = extension.getLang(); this.zoneManager = zoneManager; + System.out.println("trackBlockChanges=" + config.isTrackBlockChanges()); + System.out.println("isPreventBlockExplode=" + config.isPreventBlockExplode()); } @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @@ -181,45 +183,45 @@ public void on(final BlockBurnEvent event) { } - // @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) - // public void on(final EntityExplodeEvent event) { - // final Zone zone = zoneManager.get(event.getEntity().getLocation().getBlock()); + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) + public void on(final EntityExplodeEvent event) { + final Zone zone = zoneManager.get(event.getEntity().getLocation().getBlock()); - // if (zone == null) { - // return; - // } + if (zone == null) { + return; + } - // if (config.isTrackBlockChanges()) { - // zone.track(event.blockList()); - // } + if (config.isTrackBlockChanges()) { + zone.track(event.blockList()); + } - // if (!config.isPreventBlockExplode()) { - // return; - // } + if (!config.isPreventBlockExplode()) { + return; + } - // event.setCancelled(true); - // } + event.setCancelled(true); + } - // @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) - // public void on(final BlockExplodeEvent event) { - // final Block block = event.getBlock(); - // final Zone zone = zoneManager.get(block); + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) + public void on(final BlockExplodeEvent event) { + final Block block = event.getBlock(); + final Zone zone = zoneManager.get(block); - // if (zone == null) { - // return; - // } + if (zone == null) { + return; + } - // if (config.isTrackBlockChanges()) { - // zone.track(event.blockList()); - // } + if (config.isTrackBlockChanges()) { + zone.track(event.blockList()); + } - // if (!config.isPreventBlockExplode()) { - // return; - // } + if (!config.isPreventBlockExplode()) { + return; + } - // event.setCancelled(true); - // } + event.setCancelled(true); + } @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) diff --git a/arenaregen/src/main/java/me/realized/de/arenaregen/zone/task/tasks/ResetBlocksTask.java b/arenaregen/src/main/java/me/realized/de/arenaregen/zone/task/tasks/ResetBlocksTask.java index 82b0910..c910c96 100644 --- a/arenaregen/src/main/java/me/realized/de/arenaregen/zone/task/tasks/ResetBlocksTask.java +++ b/arenaregen/src/main/java/me/realized/de/arenaregen/zone/task/tasks/ResetBlocksTask.java @@ -43,6 +43,11 @@ public void run() { if (handler instanceof NMSHandler) { zone.startTask(null); zone.getArena().setDisabled(false); + + if (onDone != null) { + onDone.call(); + } + return; } diff --git a/build.gradle b/build.gradle index 6a9cf4f..b9e39f2 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { allprojects { group 'me.realized.de' - version '1.1.0' + version '1.2.0' } subprojects {