#38: fix so that the chat event is cancelled regardless of staff chat event outcome

This commit is contained in:
2025-02-10 00:58:04 +01:00
parent d398959533
commit e8b612ee9d
2 changed files with 4 additions and 4 deletions
@@ -52,6 +52,8 @@ public class BungeeChatListener implements Listener {
return; return;
} }
event.setCancelled(true);
String format = Objects.requireNonNull(config.getString("settings.format", "")); String format = Objects.requireNonNull(config.getString("settings.format", ""));
String message = event.getMessage().substring(isToggled ? 0 : character.length()).trim(); 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())) .filter(p -> p.hasPermission(Permissions.SEE.permission()))
.forEach(p -> p.sendMessage(messageComponents)); .forEach(p -> p.sendMessage(messageComponents));
plugin.getLogger().info(ChatColor.stripColor(appliedFormat)); plugin.getLogger().info(ChatColor.stripColor(appliedFormat));
event.setCancelled(true);
} }
@Contract("_ -> new") @Contract("_ -> new")
@@ -48,6 +48,8 @@ public class StaffChatHandler {
return; return;
} }
event.setCancelled(true);
String format = Objects.requireNonNull(config.getString("settings.format", "")); String format = Objects.requireNonNull(config.getString("settings.format", ""));
String message = event.getMessage().substring(isToggled ? 0 : character.length()).trim(); String message = event.getMessage().substring(isToggled ? 0 : character.length()).trim();
if (config.getBoolean("settings.replaceplaceholdersinmessage")) { if (config.getBoolean("settings.replaceplaceholdersinmessage")) {
@@ -70,8 +72,6 @@ public class StaffChatHandler {
if (plugin.getConfig().getBoolean("discordsrv.enable")) { if (plugin.getConfig().getBoolean("discordsrv.enable")) {
sendDiscordMessage(event.getPlayer(), message); sendDiscordMessage(event.getPlayer(), message);
} }
event.setCancelled(true);
} }
public void sendStaffChatMessage(String format, Supplier<String> nameSupplier, String message) { public void sendStaffChatMessage(String format, Supplier<String> nameSupplier, String message) {