@@ -57,7 +57,6 @@ class ChatListener : Listener {
5757 fun AsyncChatDecorateEvent.onChatPreview () {
5858 player()?.let { player ->
5959 result(result().parseTags(player, false ))
60- result(appendChannelFormat(result(), player))
6160 }
6261 }
6362
@@ -78,7 +77,7 @@ class ChatListener : Listener {
7877
7978 val simpleMessage = Component .textOfChildren(player.name().style(Style .style(TextDecoration .ITALIC )), Component .text(" : " ), baseMessage)
8079 if (channel.logToConsole) Bukkit .getConsoleSender().sendMessage(simpleMessage)
81- handleProxyMessage(player, channelId, channel, message(), simpleMessage)
80+ handleProxyMessage(player, channelId, channel, appendChannelFormat( message(), player, channel ), simpleMessage)
8281
8382 val pingedPlayer = originalMessage().serialize().checkForPlayerPings(channelId)
8483 val playerViewers = viewers().mapNotNull { it as ? Player }.toMutableSet()
@@ -90,6 +89,7 @@ class ChatListener : Listener {
9089 var finalMessage = message()
9190 finalMessage = handleChatFilters(finalMessage, player, receiver, false ) ? : return @forEach
9291 finalMessage = formatPlayerPingMessage(player, pingedPlayer, receiver, finalMessage)
92+ finalMessage = appendChannelFormat(finalMessage, player, channel)
9393 finalMessage = formatModerationMessage(channel.messageDeletion, finalMessage, simpleMessage, signedMessage(), receiver, player, playerViewers)
9494
9595 receiver.sendMessage(finalMessage)
@@ -105,6 +105,7 @@ class ChatListener : Listener {
105105 finalMessage = handleChatFilters(finalMessage, player, audience as ? Player , false )
106106 ? : return @renderer Component .empty()
107107 finalMessage = formatPlayerPingMessage(source, pingedPlayer, audience, finalMessage)
108+ finalMessage = appendChannelFormat(finalMessage, source, channel)
108109 finalMessage = formatModerationMessage(channel.messageDeletion, finalMessage, simpleMessage, signedMessage(), audience, source, playerViewers)
109110
110111 return @renderer finalMessage
0 commit comments