From e8b612ee9d3c10c52af161854c5021311345302b Mon Sep 17 00:00:00 2001 From: Oskar Nordling Date: Mon, 10 Feb 2025 00:58:04 +0100 Subject: [PATCH] #38: fix so that the chat event is cancelled regardless of staff chat event outcome --- .../staffchat/bungee/listener/BungeeChatListener.java | 4 ++-- .../oskar3123/staffchat/spigot/handler/StaffChatHandler.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/me/oskar3123/staffchat/bungee/listener/BungeeChatListener.java b/src/main/java/me/oskar3123/staffchat/bungee/listener/BungeeChatListener.java index 6290844..1348682 100644 --- a/src/main/java/me/oskar3123/staffchat/bungee/listener/BungeeChatListener.java +++ b/src/main/java/me/oskar3123/staffchat/bungee/listener/BungeeChatListener.java @@ -52,6 +52,8 @@ public class BungeeChatListener implements Listener { return; } + event.setCancelled(true); + String format = Objects.requireNonNull(config.getString("settings.format", "")); String message = event.getMessage().substring(isToggled ? 0 : character.length()).trim(); @@ -80,8 +82,6 @@ public class BungeeChatListener implements Listener { .filter(p -> p.hasPermission(Permissions.SEE.permission())) .forEach(p -> p.sendMessage(messageComponents)); plugin.getLogger().info(ChatColor.stripColor(appliedFormat)); - - event.setCancelled(true); } @Contract("_ -> new") diff --git a/src/main/java/me/oskar3123/staffchat/spigot/handler/StaffChatHandler.java b/src/main/java/me/oskar3123/staffchat/spigot/handler/StaffChatHandler.java index f3265f3..15c253f 100644 --- a/src/main/java/me/oskar3123/staffchat/spigot/handler/StaffChatHandler.java +++ b/src/main/java/me/oskar3123/staffchat/spigot/handler/StaffChatHandler.java @@ -48,6 +48,8 @@ public class StaffChatHandler { return; } + event.setCancelled(true); + String format = Objects.requireNonNull(config.getString("settings.format", "")); String message = event.getMessage().substring(isToggled ? 0 : character.length()).trim(); if (config.getBoolean("settings.replaceplaceholdersinmessage")) { @@ -70,8 +72,6 @@ public class StaffChatHandler { if (plugin.getConfig().getBoolean("discordsrv.enable")) { sendDiscordMessage(event.getPlayer(), message); } - - event.setCancelled(true); } public void sendStaffChatMessage(String format, Supplier nameSupplier, String message) {