From 6db05599067f719699964f5259ee1a6a07f852c9 Mon Sep 17 00:00:00 2001
From: creeper123123321 <7974274+creeper123123321@users.noreply.github.com>
Date: Thu, 4 May 2023 09:36:32 -0300
Subject: [PATCH] don't kick if plugin message transformation fails

---
 build.gradle.kts                              |  4 ++--
 .../viaversion/aas/handler/state/PlayState.kt | 24 +++++++++++--------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index badfb41..48a0d46 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -61,8 +61,8 @@ dependencies {
     implementation(kotlin("stdlib-jdk8"))
     implementation(kotlin("reflect"))
 
-    val vvVer = "4.7.0-23w16a-SNAPSHOT"
-    val vbVer = "4.7.0-23w16a-SNAPSHOT"
+    val vvVer = "4.7.0-23w18a-SNAPSHOT"
+    val vbVer = "4.7.0-23w18a-SNAPSHOT"
     val vrVer = "5f7fdc5"
     implementation("com.viaversion:viaversion:$vvVer") { isTransitive = false }
     implementation("com.viaversion:viabackwards:$vbVer") { isTransitive = false }
diff --git a/src/main/kotlin/com/viaversion/aas/handler/state/PlayState.kt b/src/main/kotlin/com/viaversion/aas/handler/state/PlayState.kt
index f66f873..459f6cd 100644
--- a/src/main/kotlin/com/viaversion/aas/handler/state/PlayState.kt
+++ b/src/main/kotlin/com/viaversion/aas/handler/state/PlayState.kt
@@ -58,19 +58,23 @@ class PlayState : ConnectionState {
 
     private fun modifyPluginMessage(handler: MinecraftHandler, pluginMessage: PluginMessage) {
         if (handler.frontEnd) return
-        when (pluginMessage.channel) {
-            "MC|Brand", "brand", "minecraft:brand" -> {
-                if (!VIAaaSConfig.showBrandInfo) return
+        try {
+            when (pluginMessage.channel) {
+                "MC|Brand", "brand", "minecraft:brand" -> {
+                    if (!VIAaaSConfig.showBrandInfo) return
 
-                val brand = "${
-                    decodeBrand(
-                        pluginMessage.data,
-                        is17(handler)
-                    )
-                }${" (VIAaaS C: ${handler.data.frontVer?.parseProtocol()} S: ${handler.data.backServerVer?.parseProtocol()})"}"
+                    val brand = "${
+                        decodeBrand(
+                            pluginMessage.data,
+                            is17(handler)
+                        )
+                    }${" (VIAaaS C: ${handler.data.frontVer?.parseProtocol()} S: ${handler.data.backServerVer?.parseProtocol()})"}"
 
-                pluginMessage.data = encodeBrand(brand, is17(handler))
+                    pluginMessage.data = encodeBrand(brand, is17(handler))
+                }
             }
+        } catch (e: Exception) {
+            mcLogger.debug("Couldn't modify plugin message", e)
         }
     }