From 0f93956c5ef7d005d6282b46e9a9476c17810cb4 Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Tue, 27 Jul 2021 20:34:48 +0200
Subject: [PATCH] network: fix json chat component reading

---
 src/main/java/de/bixilon/minosoft/data/text/ChatComponent.kt | 5 +++--
 .../bixilon/minosoft/protocol/protocol/PlayInByteBuffer.kt   | 3 +--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/de/bixilon/minosoft/data/text/ChatComponent.kt b/src/main/java/de/bixilon/minosoft/data/text/ChatComponent.kt
index 50e512528..f1639af65 100644
--- a/src/main/java/de/bixilon/minosoft/data/text/ChatComponent.kt
+++ b/src/main/java/de/bixilon/minosoft/data/text/ChatComponent.kt
@@ -12,6 +12,7 @@
  */
 package de.bixilon.minosoft.data.text
 
+import com.squareup.moshi.JsonEncodingException
 import de.bixilon.minosoft.data.language.Translator
 import de.bixilon.minosoft.gui.eros.util.JavaFXUtil.text
 import de.bixilon.minosoft.gui.rendering.RenderWindow
@@ -98,8 +99,8 @@ interface ChatComponent {
             }
             if (!ignoreJson && string.startsWith('{')) {
                 try {
-                    return BaseComponent(translator, parent, JSONSerializer.MAP_ADAPTER.fromJson(string))
-                } catch (ignored: RuntimeException) {
+                    return BaseComponent(translator, parent, JSONSerializer.MAP_ADAPTER.fromJson(string)!!)
+                } catch (ignored: JsonEncodingException) {
                 }
             }
 
diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/PlayInByteBuffer.kt b/src/main/java/de/bixilon/minosoft/protocol/protocol/PlayInByteBuffer.kt
index 4c13bdfa1..80170467c 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/protocol/PlayInByteBuffer.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/PlayInByteBuffer.kt
@@ -22,7 +22,6 @@ import de.bixilon.minosoft.data.registries.particle.data.ItemParticleData
 import de.bixilon.minosoft.data.registries.particle.data.ParticleData
 import de.bixilon.minosoft.data.registries.recipes.Ingredient
 import de.bixilon.minosoft.data.text.ChatComponent
-import de.bixilon.minosoft.data.text.ChatComponent.Companion.of
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.*
 import de.bixilon.minosoft.util.nbt.tag.NBTUtil.compoundCast
@@ -70,7 +69,7 @@ class PlayInByteBuffer : InByteBuffer {
     }
 
     override fun readChatComponent(): ChatComponent {
-        return of(readString(), connection.version.language, null)
+        return ChatComponent.of(readString(), connection.version.language, null)
     }
 
     fun readParticle(): ParticleData {