fix: DiscordListener not respecting channel.discordsrv setting

MineInAbyss · Jan 12, 2024 · f2e6773 · f2e6773
1 parent 7f9b12a
commit f2e6773
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/chatty-paper/src/main/kotlin/com/mineinabyss/chatty/listeners/DiscordListener.kt b/chatty-paper/src/main/kotlin/com/mineinabyss/chatty/listeners/DiscordListener.kt
@@ -34,19 +34,10 @@ class DiscordListener {
 
     @Subscribe(priority = ListenerPriority.NORMAL)
     fun GameChatMessagePreProcessEvent.onChat() {
-        val data = player.toGeary().get<ChannelData>() ?: return
-        val channel = data.channel ?: return
-        val lastUsedChannel = data.lastChannelUsed ?: return
+        val channel = player.toGeary().get<ChannelData>()?.channel ?: return
+        if (!channel.discordsrv) isCancelled = true
     }
 
-    // Parse the DSRV Component through the Chatty normal MM instance to format <chatty> tags, then serialize/deserialize it back to DSRV Component
-    private fun ComponentDSV.stripFormat(player: Player, channel: ChattyChannel): ComponentDSV =
-        mm.deserialize(plainText.serialize(this).replace(
-            plainText.serialize(
-                mm.deserialize(translatePlaceholders(player, channel.format).parseTags(player, true).serialize())
-            ), ""
-        ))
-
     @Subscribe
     fun DeathMessagePreProcessEvent.onDeath() {
         if (isCancelled) return