#38: fix so that the chat event is cancelled regardless of staff chat event outcome
This commit is contained in:
@@ -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")
|
||||
|
||||
@@ -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<String> nameSupplier, String message) {
|
||||
|
||||
Reference in New Issue
Block a user