diff --git a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java index db42128..957fc89 100755 --- a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java +++ b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java @@ -59,7 +59,10 @@ public class ChatListener implements Listener { plainTextComponentSerializer.serialize(event.originalMessage()) ); - event.result(formatComponent.replaceText(TextReplacementConfig.builder().match("%message%").replacement(message).build())); + event.result(formatComponent.replaceText(TextReplacementConfig.builder() + .match("%message%") + .replacement(message) + .build())); } @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true) @@ -73,7 +76,10 @@ public class ChatListener implements Listener { plainTextComponentSerializer.serialize(event.originalMessage()) ); - event.result(formatComponent.replaceText(TextReplacementConfig.builder().match("%message%").replacement(message).build())); + event.result(formatComponent.replaceText(TextReplacementConfig.builder() + .match("%message%") + .replacement(message) + .build())); } private final Component mention = MiniMessage.miniMessage().deserialize(Config.MENTIONPLAYERTAG); @@ -120,7 +126,12 @@ public class ChatListener implements Listener { "" ); String originalMessage = PlainTextComponentSerializer.plainText().serialize(inputComponent); - chatLogHandler.addChatLog(uuid, ServerName.getServerName(), originalMessage, inputComponent, true); + chatLogHandler.addChatLog(uuid, + ServerName.getServerName(), + originalMessage, + render(player, inputComponent).asComponent(), + true + ); return; // the message was blocked } @@ -128,9 +139,13 @@ public class ChatListener implements Listener { .map(audience -> (Player) audience); if (!player.hasPermission("chat.ignorebypass")) { - stream = stream.filter(receiver -> !ChatUserManager.getChatUser(receiver.getUniqueId()).getIgnoredPlayers().contains( - uuid) - || receiver.hasPermission("chat.ignorebypass")); + stream = stream.filter(receiver -> { + boolean isPlayerIgnored = ChatUserManager + .getChatUser(receiver.getUniqueId()) + .getIgnoredPlayers() + .contains(uuid); + return !isPlayerIgnored || receiver.hasPermission("chat.ignorebypass"); + }); } Set receivers = stream.collect(Collectors.toSet()); @@ -147,7 +162,7 @@ public class ChatListener implements Listener { chatLogHandler.addChatLog(uuid, ServerName.getServerName(), modifiableString.string(), - modifiableString.component(), + input.asComponent(), false ); ALogger.info(PlainTextComponentSerializer.plainText().serialize(inputComponent)); @@ -179,7 +194,9 @@ public class ChatListener implements Listener { // return ; // }); - if (!ChatUserManager.getChatUser(onlinePlayer.getUniqueId()).getIgnoredPlayers().contains(player.getUniqueId()) + if (!ChatUserManager.getChatUser(onlinePlayer.getUniqueId()) + .getIgnoredPlayers() + .contains(player.getUniqueId()) || player.hasPermission("chat.ignorebypass")) { playersToPing.add(onlinePlayer); } @@ -189,7 +206,9 @@ public class ChatListener implements Listener { .match(nickPattern) .replacement(mention.append(onlinePlayerUser.getDisplayName())) .build()); - if (!ChatUserManager.getChatUser(onlinePlayer.getUniqueId()).getIgnoredPlayers().contains(player.getUniqueId()) + if (!ChatUserManager.getChatUser(onlinePlayer.getUniqueId()) + .getIgnoredPlayers() + .contains(player.getUniqueId()) || player.hasPermission("chat.ignorebypass")) { playersToPing.add(onlinePlayer); }