diff --git a/src/main/java/io/github/sefiraat/networks/listeners/BlockListener.java b/src/main/java/io/github/sefiraat/networks/listeners/BlockListener.java deleted file mode 100644 index 127decc6..00000000 --- a/src/main/java/io/github/sefiraat/networks/listeners/BlockListener.java +++ /dev/null @@ -1,42 +0,0 @@ -package io.github.sefiraat.networks.listeners; - -import io.github.sefiraat.networks.NetworkStorage; -import io.github.sefiraat.networks.Networks; -import io.github.sefiraat.networks.utils.NetworkUtils; -import org.bukkit.event.EventHandler; -import org.bukkit.event.EventPriority; -import org.bukkit.event.Listener; -import org.bukkit.event.block.BlockBreakEvent; -import org.bukkit.event.block.BlockPlaceEvent; -import org.bukkit.event.world.ChunkUnloadEvent; - -import java.text.MessageFormat; - -/* - * Fix https://github.com/Sefiraat/Networks/issues/188 - * Fix https://github.com/Sefiraat/Networks/issues/192 - * Fix https://github.com/ytdd9527/NetworksExpansion/issues/119 - */ -public class BlockListener implements Listener { - private static final String S1 = "Listened BlockBreakEvent at {0}"; - private static final String S2 = "Listened BlockPlaceEvent at {0}"; - private static final String S3 = "Listened ChunkUnloadEvent at world: {0}, x: {1}, z: {2}"; - - @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) - public void onBlockBreak(BlockBreakEvent e) { - Networks.getInstance().debug(MessageFormat.format(S1, e.getBlock().getLocation())); - NetworkUtils.clearNetwork(e.getBlock().getLocation()); - } - - @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) - public void onBlockPlace(BlockPlaceEvent e) { - Networks.getInstance().debug(MessageFormat.format(S2, e.getBlock().getLocation())); - NetworkUtils.clearNetwork(e.getBlock().getLocation()); - } - - @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) - public void onChunkUnload(ChunkUnloadEvent e) { - Networks.getInstance().debug(MessageFormat.format(S3, e.getWorld().getName(), e.getChunk().getX(), e.getChunk().getZ())); - NetworkStorage.unregisterChunk(e.getChunk()); - } -} diff --git a/src/main/java/io/github/sefiraat/networks/listeners/SyncListener.java b/src/main/java/io/github/sefiraat/networks/listeners/SyncListener.java new file mode 100644 index 00000000..79383cb6 --- /dev/null +++ b/src/main/java/io/github/sefiraat/networks/listeners/SyncListener.java @@ -0,0 +1,24 @@ +package io.github.sefiraat.networks.listeners; + +import javax.annotation.Nonnull; + +import org.bukkit.event.EventHandler; +import org.bukkit.event.EventPriority; +import org.bukkit.event.Listener; +import org.bukkit.event.block.BlockBreakEvent; +import org.bukkit.event.block.BlockPlaceEvent; + +import io.github.sefiraat.networks.utils.NetworkUtils; + +public class SyncListener implements Listener { + + @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) + public void onBlockBreak(@Nonnull BlockBreakEvent event) { + NetworkUtils.clearNetwork(event.getBlock().getLocation()); + } + + @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) + public void onBlockPlace(@Nonnull BlockPlaceEvent event) { + NetworkUtils.clearNetwork(event.getBlock().getLocation()); + } +} \ No newline at end of file diff --git a/src/main/java/io/github/sefiraat/networks/managers/ListenerManager.java b/src/main/java/io/github/sefiraat/networks/managers/ListenerManager.java index 037bbbf5..3c3bc503 100644 --- a/src/main/java/io/github/sefiraat/networks/managers/ListenerManager.java +++ b/src/main/java/io/github/sefiraat/networks/managers/ListenerManager.java @@ -2,16 +2,20 @@ import com.ytdd9527.networksexpansion.core.listener.NetworksGuideListener; import io.github.sefiraat.networks.Networks; -import io.github.sefiraat.networks.listeners.BlockListener; import io.github.sefiraat.networks.listeners.ExplosiveToolListener; +import io.github.sefiraat.networks.listeners.SyncListener; import org.bukkit.event.Listener; public class ListenerManager { public ListenerManager() { addListener(new ExplosiveToolListener()); +//<<<<<<< HEAD addListener(new BlockListener()); addListener(new NetworksGuideListener()); +//======= + addListener(new SyncListener()); +//>>>>>>> 31b943e4a683c3e7836b78647c1834e086fa9a39 } private void addListener(Listener listener) {