From 5b807a9f17aec3ca3d51d80c0c39312e5bd529f4 Mon Sep 17 00:00:00 2001
From: KennyTV <kennytv@t-online.de>
Date: Tue, 23 Jun 2020 23:33:59 +0200
Subject: [PATCH] Fix motd reading in some cases Fixes #1826

---
 .../protocol1_16to1_15_2/Protocol1_16To1_15_2.java         | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
index cad787ef9..219c25e03 100644
--- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
+++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_16to1_15_2/Protocol1_16To1_15_2.java
@@ -62,7 +62,7 @@ public class Protocol1_16To1_15_2 extends Protocol<ClientboundPackets1_15, Clien
             @Override
             public void registerMap() {
                 handler(wrapper -> {
-                    String original = wrapper.read(Type.STRING);
+                    String original = wrapper.passthrough(Type.STRING);
                     JsonObject object = GsonUtil.getGson().fromJson(original, JsonObject.class);
                     JsonObject players = object.getAsJsonObject("players");
                     if (players == null) return;
@@ -88,11 +88,10 @@ public class Protocol1_16To1_15_2 extends Protocol<ClientboundPackets1_15, Clien
                         }
                     }
 
+                    // Replace data if changed
                     if (splitSamples.size() != sample.size()) {
                         players.add("sample", splitSamples);
-                        wrapper.write(Type.STRING, object.toString());
-                    } else {
-                        wrapper.write(Type.STRING, original);
+                        wrapper.set(Type.STRING, 0, object.toString());
                     }
                 });
             }