diff --git a/libs/Vanish-OG b/libs/Vanish-OG index 64d652a..03b955f 160000 --- a/libs/Vanish-OG +++ b/libs/Vanish-OG @@ -1 +1 @@ -Subproject commit 64d652a6760ab5fc6356e1e65207027eb1bae36c +Subproject commit 03b955fd2a41769d0bca120e020983be54bad175 diff --git a/src/main/kotlin/nl/skbotnl/chatog/chatsystem/ChatSystem.kt b/src/main/kotlin/nl/skbotnl/chatog/chatsystem/ChatSystem.kt index 86ac932..f60748e 100644 --- a/src/main/kotlin/nl/skbotnl/chatog/chatsystem/ChatSystem.kt +++ b/src/main/kotlin/nl/skbotnl/chatog/chatsystem/ChatSystem.kt @@ -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${PlayerUtils.getSuffix(player.uniqueId)} &7> ")