Skip to content

Commit 4bbda8a

Browse files
committed
fixed customchat & fancychat interacting with commands
1 parent 198fe60 commit 4bbda8a

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

src/main/kotlin/com/lambda/module/modules/chat/CustomChat.kt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818
package com.lambda.module.modules.chat
1919

2020
import com.google.common.collect.Comparators.min
21+
import com.lambda.command.CommandRegistry.prefix
2122
import com.lambda.event.events.ChatEvent
2223
import com.lambda.event.listener.SafeListener.Companion.listen
24+
import com.lambda.interaction.BaritoneManager
2325
import com.lambda.module.Module
2426
import com.lambda.module.tag.ModuleTag
2527
import com.lambda.util.NamedEnum
@@ -36,6 +38,15 @@ object CustomChat : Module(
3638

3739
init {
3840
listen<ChatEvent.Send> {
41+
val isBaritone = BaritoneManager.baritoneSettings?.prefix?.value
42+
?.let { setting -> it.message.startsWith(setting)}
43+
?: false
44+
45+
val isLambda = it.message.startsWith(prefix)
46+
47+
if (isLambda || isBaritone)
48+
return@listen
49+
3950
val message = "${it.message} ${decoration.block(text.block())}"
4051
it.message = message.take(min(256, message.length))
4152
}

src/main/kotlin/com/lambda/module/modules/chat/FancyChat.kt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@
1717

1818
package com.lambda.module.modules.chat
1919

20+
import com.lambda.command.CommandRegistry.prefix
2021
import com.lambda.event.events.ChatEvent
2122
import com.lambda.event.listener.SafeListener.Companion.listen
23+
import com.lambda.interaction.BaritoneManager
2224
import com.lambda.module.Module
2325
import com.lambda.module.tag.ModuleTag
2426
import com.lambda.util.ChatUtils.toBlue
@@ -38,6 +40,15 @@ object FancyChat : Module(
3840

3941
init {
4042
listen<ChatEvent.Send> {
43+
val isBaritone = BaritoneManager.baritoneSettings?.prefix?.value
44+
?.let { setting -> it.message.startsWith(setting)}
45+
?: false
46+
47+
val isLambda = it.message.startsWith(prefix)
48+
49+
if (isLambda || isBaritone)
50+
return@listen
51+
4152
if (uwu) it.message = it.message.toUwu
4253
if (leet) it.message = it.message.toLeet
4354
if (green) it.message = it.message.toGreen

0 commit comments

Comments
 (0)