From 9186365197d41eb98d1709a5442199f51bf5cd45 Mon Sep 17 00:00:00 2001 From: Oliver Date: Sat, 17 May 2025 20:45:49 +0200 Subject: [PATCH] fancyholograms-v3: Remove WorldListener --- .../listeners/WorldListener.java | 44 ------------------- .../main/FancyHologramsPlugin.java | 2 - 2 files changed, 46 deletions(-) delete mode 100644 plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/listeners/WorldListener.java diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/listeners/WorldListener.java b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/listeners/WorldListener.java deleted file mode 100644 index d6bef76e..00000000 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/listeners/WorldListener.java +++ /dev/null @@ -1,44 +0,0 @@ -package de.oliver.fancyholograms.listeners; - -import de.oliver.fancyholograms.api.data.HologramData; -import de.oliver.fancyholograms.api.hologram.Hologram; -import de.oliver.fancyholograms.main.FancyHologramsPlugin; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.world.WorldLoadEvent; -import org.bukkit.event.world.WorldUnloadEvent; - -import java.util.Collection; -import java.util.List; - -public class WorldListener implements Listener { - - @EventHandler - public void onWorldLoad(WorldLoadEvent event) { - FancyHologramsPlugin.get().getHologramThread().submit(() -> { - FancyHologramsPlugin.get().getFancyLogger().info("Loading holograms for world " + event.getWorld().getName()); - - Collection data = FancyHologramsPlugin.get().getStorage().loadAll("worlds/"+event.getWorld().getName()); - for (HologramData d : data) { - Hologram hologram = FancyHologramsPlugin.get().getHologramFactory().apply(d); - FancyHologramsPlugin.get().getRegistry().register(hologram); - } - }); - } - - @EventHandler - public void onWorldUnload(WorldUnloadEvent event) { - FancyHologramsPlugin.get().getHologramThread().submit(() -> { - FancyHologramsPlugin.get().getFancyLogger().info("Unloading holograms for world " + event.getWorld().getName()); - - List toUnload = FancyHologramsPlugin.get().getRegistry().getAll().stream() - .filter(hologram -> hologram.getData().getLocation().getWorld().equals(event.getWorld())) - .toList(); - - for (Hologram hologram : toUnload) { - FancyHologramsPlugin.get().getRegistry().unregister(hologram); - } - }); - } - -} diff --git a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/main/FancyHologramsPlugin.java b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/main/FancyHologramsPlugin.java index 450234dc..6f1d1009 100644 --- a/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/main/FancyHologramsPlugin.java +++ b/plugins/fancyholograms/src/main/java/de/oliver/fancyholograms/main/FancyHologramsPlugin.java @@ -23,7 +23,6 @@ import de.oliver.fancyholograms.hologram.version.*; import de.oliver.fancyholograms.listeners.BedrockPlayerListener; import de.oliver.fancyholograms.listeners.NpcListener; import de.oliver.fancyholograms.listeners.PlayerListener; -import de.oliver.fancyholograms.listeners.WorldListener; import de.oliver.fancyholograms.metrics.FHMetrics; import de.oliver.fancyholograms.registry.HologramRegistryImpl; import de.oliver.fancyholograms.storage.HologramStorage; @@ -263,7 +262,6 @@ public final class FancyHologramsPlugin extends JavaPlugin implements FancyHolog private void registerListeners() { getServer().getPluginManager().registerEvents(new PlayerListener(this), this); - getServer().getPluginManager().registerEvents(new WorldListener(), this); if (PluginUtils.isFancyNpcsEnabled()) { getServer().getPluginManager().registerEvents(new NpcListener(this), this);