From 53ba205afdd2e2d65faa8649609f5a6b05225740 Mon Sep 17 00:00:00 2001 From: Sefiraat Date: Tue, 10 Sep 2024 09:41:03 +0100 Subject: [PATCH 1/2] Register the listener --- .../io/github/sefiraat/networks/listeners/SyncListener.java | 3 ++- .../io/github/sefiraat/networks/managers/ListenerManager.java | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/io/github/sefiraat/networks/listeners/SyncListener.java b/src/main/java/io/github/sefiraat/networks/listeners/SyncListener.java index 1edc999b..79383cb6 100644 --- a/src/main/java/io/github/sefiraat/networks/listeners/SyncListener.java +++ b/src/main/java/io/github/sefiraat/networks/listeners/SyncListener.java @@ -4,12 +4,13 @@ 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 { +public class SyncListener implements Listener { @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) public void onBlockBreak(@Nonnull BlockBreakEvent event) { 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 11b23074..43afc31a 100644 --- a/src/main/java/io/github/sefiraat/networks/managers/ListenerManager.java +++ b/src/main/java/io/github/sefiraat/networks/managers/ListenerManager.java @@ -2,12 +2,15 @@ import io.github.sefiraat.networks.Networks; 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()); + addListener(new SyncListener()); } private void addListener(Listener listener) { From 31b943e4a683c3e7836b78647c1834e086fa9a39 Mon Sep 17 00:00:00 2001 From: ybw0014 Date: Wed, 16 Oct 2024 15:06:32 -0700 Subject: [PATCH 2/2] chore: cleanup --- .../networks/listeners/BlockListener.java | 35 ------------------- .../networks/managers/ListenerManager.java | 1 - 2 files changed, 36 deletions(-) delete mode 100644 src/main/java/io/github/sefiraat/networks/listeners/BlockListener.java 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 17cf89ad..00000000 --- a/src/main/java/io/github/sefiraat/networks/listeners/BlockListener.java +++ /dev/null @@ -1,35 +0,0 @@ -package io.github.sefiraat.networks.listeners; - -import io.github.sefiraat.networks.NetworkStorage; -import io.github.sefiraat.networks.network.NetworkNode; -import io.github.sefiraat.networks.network.NodeDefinition; -import io.github.sefiraat.networks.network.NodeType; -import io.github.sefiraat.networks.slimefun.network.NetworkController; -import org.bukkit.Location; -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; - -public class BlockListener implements Listener { - @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) - public void onBlockBreak(BlockBreakEvent e) { - removeNetwork(e.getBlock().getLocation()); - } - - @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) - public void onBlockPlace(BlockPlaceEvent e) { - removeNetwork(e.getBlock().getLocation()); - } - - private void removeNetwork(Location location) { - NodeDefinition definition = NetworkStorage.getAllNetworkObjects().get(location); - if (definition == null) return; - NetworkNode node = definition.getNode(); - if (node != null && node.getNodeType() == NodeType.CONTROLLER) { - NetworkController.wipeNetwork(location); - } - NetworkStorage.removeNode(location); - } -} 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 43afc31a..029c7d4b 100644 --- a/src/main/java/io/github/sefiraat/networks/managers/ListenerManager.java +++ b/src/main/java/io/github/sefiraat/networks/managers/ListenerManager.java @@ -3,7 +3,6 @@ import io.github.sefiraat.networks.Networks; import io.github.sefiraat.networks.listeners.ExplosiveToolListener; import io.github.sefiraat.networks.listeners.SyncListener; - import org.bukkit.event.Listener; public class ListenerManager {