From 70009c4bf96e20274454b207416b57eacf1bafc8 Mon Sep 17 00:00:00 2001
From: rtm516 <ryantmilner@hotmail.co.uk>
Date: Mon, 29 Jun 2020 13:50:16 +0100
Subject: [PATCH] Clean chat code and fix skins

---
 connector/pom.xml                             |  2 +-
 .../connector/utils/MessageUtils.java         | 19 +++++++------------
 .../geysermc/connector/utils/SkinUtils.java   |  1 +
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/connector/pom.xml b/connector/pom.xml
index ddc62bf2a..09171248a 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -105,7 +105,7 @@
         <dependency>
             <groupId>com.github.GeyserMC</groupId>
             <artifactId>MCProtocolLib</artifactId>
-            <version>feature~1.16-1.12.1-1-g74ee57a-310</version>
+            <version>feature~1.16-1.12.1-1-ge4798a3-318</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
diff --git a/connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java b/connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java
index 96775f245..3a35782d4 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/MessageUtils.java
@@ -32,6 +32,7 @@ import com.github.steveice10.mc.protocol.data.message.TextMessage;
 import com.github.steveice10.mc.protocol.data.message.TranslationMessage;
 import com.github.steveice10.mc.protocol.data.message.style.ChatColor;
 import com.github.steveice10.mc.protocol.data.message.style.ChatFormat;
+import com.github.steveice10.mc.protocol.data.message.style.MessageStyle;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import net.kyori.text.Component;
@@ -216,25 +217,19 @@ public class MessageUtils {
         if (parent == null) {
             return message;
         }
-        Message newMessage = message;
+        MessageStyle.Builder styleBuilder = message.getStyle().toBuilder();
 
         // Copy color from parent
-        if (newMessage.getStyle().getColor() == ChatColor.NONE) {
-            JsonObject messageObject = MessageSerializer.toJsonObject(newMessage);
-            messageObject.addProperty("color", parent.getStyle().getColor());
-            newMessage = MessageSerializer.fromJson(messageObject);
+        if (message.getStyle().getColor() == ChatColor.NONE) {
+            styleBuilder.color(parent.getStyle().getColor());
         }
 
         // Copy formatting from parent
-        if (newMessage.getStyle().getFormats().size() == 0) {
-            JsonObject messageObject = MessageSerializer.toJsonObject(newMessage);
-            for(ChatFormat format : parent.getStyle().getFormats()) {
-                messageObject.addProperty(format.toString(), true);
-            }
-            newMessage = MessageSerializer.fromJson(messageObject);
+        if (message.getStyle().getFormats().size() == 0) {
+            styleBuilder.formats(parent.getStyle().getFormats());
         }
 
-        return newMessage;
+        return message.toBuilder().style(styleBuilder.build()).build();
     }
 
     public static String getBedrockMessage(Message message) {
diff --git a/connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java b/connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java
index ae17ed205..9e0712477 100644
--- a/connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java
+++ b/connector/src/main/java/org/geysermc/connector/utils/SkinUtils.java
@@ -96,6 +96,7 @@ public class SkinUtils {
         entry.setXuid("");
         entry.setPlatformChatId("");
         entry.setTeacher(false);
+        entry.setTrustedSkin(true);
         return entry;
     }