Merge from upstream #1

Merged
NotAlexNoyle merged 5 commits from main into main 2026-10-18 15:15:28 -04:00
2 changed files with 4 additions and 3 deletions

No files matched your search

@@ -46,11 +46,12 @@ internal abstract class ChatSystem {
val discordPlayerPartString =
listOfNotNull(prefix, ChatUtil.getPlayerPartString(player, includeSuffix = true)).joinToString(" | ")
sendDiscordMessage(resolveChatItems(text), discordPlayerPartString, player.uniqueId)
// This must be above sendDiscordMessage because processText will exit if a disallowed link is sent
val messageComponent =
ChatUtil.processText(text, player)?.color(PlayerUtils.getMessageColor(player.uniqueId)) ?: return
sendDiscordMessage(resolveChatItems(text), discordPlayerPartString, player.uniqueId)
val chatComponent =
UtilitiesOG.trueogColorize(
ChatUtil.legacyToMm("$playerPartString<reset>${PlayerUtils.getSuffix(player.uniqueId)} &7> ")