Skip to content

Commit dd97c48

Browse files
committed
Fixed "!" symbol in global type message.
Fixed lower case message variant.
1 parent 0a878f6 commit dd97c48

3 files changed

Lines changed: 14 additions & 7 deletions

File tree

src/main/kotlin/com/mairwunnx/projectessentials/chat/ChatUtils.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ object ChatUtils {
1313
val blockedWordsMask = ChatModelBase.chatModel.moderation.blockedWordsMask
1414
val modifyBlockedWords = ChatModelBase.chatModel.moderation.modifyBlockedWords
1515

16-
var fixedMessage = event.message.toLowerCase()
16+
var fixedMessage = event.message
1717

1818
blockedWords.forEach {
19-
if (fixedMessage.contains(Regex(it, RegexOption.IGNORE_CASE)) ||
20-
fixedMessage.matches(Regex(it, RegexOption.IGNORE_CASE)) ||
21-
fixedMessage.contains(it, true)
19+
if (fixedMessage.toLowerCase().contains(Regex(it, RegexOption.IGNORE_CASE)) ||
20+
fixedMessage.toLowerCase().matches(Regex(it, RegexOption.IGNORE_CASE)) ||
21+
fixedMessage.toLowerCase().contains(it, true)
2222
) {
2323
if (PermissionsAPI.hasPermission(
2424
event.username, "ess.chat.blockedwords.bypass"

src/main/kotlin/com/mairwunnx/projectessentials/chat/EntryPoint.kt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,20 @@ class EntryPoint : EssBase() {
7777
ClickEvent(ClickEvent.Action.SUGGEST_COMMAND, "/m ${event.username}")
7878
)
7979

80+
// @MairwunNx -> &b@&dMairwunNx
81+
8082
event.component = TextComponentUtils.toTextComponent {
8183
ChatUtils.getMessagePattern(event).replace(
8284
"%group", PermissionsAPI.getUserGroup(event.username).name
8385
).replace(
8486
"%player", event.username
8587
).replace(
86-
"%message", event.component.formattedText
88+
"%message",
89+
if (ChatUtils.isGlobalChat(event)) {
90+
event.component.formattedText.drop(1)
91+
} else {
92+
event.component.formattedText
93+
}
8794
).replace(
8895
"&", "§"
8996
)

src/main/kotlin/com/mairwunnx/projectessentials/chat/models/ChatModel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ data class ChatModel(
1919

2020
@Serializable
2121
data class Messaging(
22-
var messageGlobalPattern: String = "&8[&2GLOBAL&7] &a┃ &8[&6%player&8]&7: &f%message",
23-
var messageLocalPattern: String = "&8[&cLOCAL&7] &4┃ &8[&7%player&8]&7: &7§o%message",
22+
var messageGlobalPattern: String = "&8[&2GLOBAL&8] &a┃ &8[&6%player&8]&7: &f%message",
23+
var messageLocalPattern: String = "&8[&cLOCAL&8] &4┃ &8[&7%player&8]&7: &7§o%message",
2424
var messageCommonPattern: String = "&8[&7%player&8]&7: &f%message",
2525
var enableRangedChat: Boolean = true,
2626
var localChatRange: Int = 100

0 commit comments

Comments
 (0)