From 6b7c076c41a20546cb0439913de998976e53b1b7 Mon Sep 17 00:00:00 2001 From: Telesphoreo Date: Fri, 26 Jan 2024 17:13:11 -0600 Subject: [PATCH] Revert "Add BroadcastEvent" This reverts commit aab5083f78634412cea8458f51a9b6f2760812cd. --- .../java/dev/plex/event/BroadcastEvent.java | 30 ------------------- .../main/java/dev/plex/util/PlexUtils.java | 3 -- 2 files changed, 33 deletions(-) delete mode 100644 server/src/main/java/dev/plex/event/BroadcastEvent.java diff --git a/server/src/main/java/dev/plex/event/BroadcastEvent.java b/server/src/main/java/dev/plex/event/BroadcastEvent.java deleted file mode 100644 index 43d6d7d..0000000 --- a/server/src/main/java/dev/plex/event/BroadcastEvent.java +++ /dev/null @@ -1,30 +0,0 @@ -package dev.plex.event; - -import lombok.Data; -import lombok.EqualsAndHashCode; -import net.kyori.adventure.text.Component; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; -import org.jetbrains.annotations.NotNull; - -@EqualsAndHashCode(callSuper = false) -@Data -public class BroadcastEvent extends Event -{ - private static final HandlerList handlers = new HandlerList(); - - private final Component message; - - private final String string; - - public static HandlerList getHandlerList() - { - return handlers; - } - - @Override - public @NotNull HandlerList getHandlers() - { - return handlers; - } -} diff --git a/server/src/main/java/dev/plex/util/PlexUtils.java b/server/src/main/java/dev/plex/util/PlexUtils.java index 72d2dfa..dd9755a 100644 --- a/server/src/main/java/dev/plex/util/PlexUtils.java +++ b/server/src/main/java/dev/plex/util/PlexUtils.java @@ -4,7 +4,6 @@ import com.google.common.base.CharMatcher; import com.google.common.collect.Lists; import dev.plex.Plex; import dev.plex.PlexBase; -import dev.plex.event.BroadcastEvent; import dev.plex.listener.impl.ChatListener; import dev.plex.storage.StorageType; import dev.plex.util.minimessage.SafeMiniMessage; @@ -292,13 +291,11 @@ public class PlexUtils implements PlexBase public static void broadcast(String s) { Bukkit.broadcast(MINI_MESSAGE.deserialize(s)); - Bukkit.getServer().getPluginManager().callEvent(new BroadcastEvent(null, s)); } public static void broadcast(Component component) { Bukkit.broadcast(component); - Bukkit.getServer().getPluginManager().callEvent(new BroadcastEvent(component, null)); } public static void broadcastToAdmins(Component component, String permission)