From 5c8c589a40eeb2e22ec811310cce56c1f0d8755c Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Wed, 13 Dec 2023 12:06:44 +0100
Subject: [PATCH] Change read method type in update score packet

---
 .../protocol1_13to1_12_2/Protocol1_13To1_12_2.java       | 9 +--------
 .../protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java   | 2 +-
 .../protocol1_20_3to1_20_2/util/ComponentConverter.java  | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java
index f00fa1adc..bd996da0a 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_13to1_12_2/Protocol1_13To1_12_2.java
@@ -23,6 +23,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.viaversion.viaversion.api.Via;
 import com.viaversion.viaversion.api.connection.UserConnection;
+import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.api.minecraft.Position;
 import com.viaversion.viaversion.api.minecraft.entities.EntityTypes1_13;
 import com.viaversion.viaversion.api.minecraft.item.DataItem;
@@ -59,7 +60,6 @@ import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.providers.Player
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.BlockConnectionStorage;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.BlockStorage;
 import com.viaversion.viaversion.protocols.protocol1_13to1_12_2.storage.TabCompleteTracker;
-import com.viaversion.viaversion.api.minecraft.ClientWorld;
 import com.viaversion.viaversion.rewriter.SoundRewriter;
 import com.viaversion.viaversion.util.ChatColorUtil;
 import com.viaversion.viaversion.util.GsonUtil;
@@ -499,13 +499,6 @@ public class Protocol1_13To1_12_2 extends AbstractProtocol<ClientboundPackets1_1
             String displayName = wrapper.read(Type.STRING); // Display Name
             displayName = rewriteTeamMemberName(displayName);
             wrapper.write(Type.STRING, displayName);
-
-            byte action = wrapper.read(Type.BYTE);
-            wrapper.write(Type.BYTE, action);
-            wrapper.passthrough(Type.STRING); // Objective Name
-            if (action != 1) {
-                wrapper.passthrough(Type.VAR_INT); // Value
-            }
         });
 
         componentRewriter.registerTitle(ClientboundPackets1_12_1.TITLE);
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java
index d32abff43..01401efbb 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/Protocol1_20_3To1_20_2.java
@@ -79,7 +79,7 @@ public final class Protocol1_20_3To1_20_2 extends AbstractProtocol<ClientboundPa
         registerClientbound(ClientboundPackets1_20_2.UPDATE_SCORE, wrapper -> {
             wrapper.passthrough(Type.STRING); // Owner
 
-            final byte action = wrapper.read(Type.BYTE);
+            final int action = wrapper.read(Type.VAR_INT);
             final String objectiveName = wrapper.read(Type.STRING);
 
             if (action == 1) { // Reset score
diff --git a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/util/ComponentConverter.java b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/util/ComponentConverter.java
index 5d856a457..5e8a2e1ea 100644
--- a/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/util/ComponentConverter.java
+++ b/common/src/main/java/com/viaversion/viaversion/protocols/protocol1_20_3to1_20_2/util/ComponentConverter.java
@@ -157,7 +157,7 @@ public final class ComponentConverter {
             return listTag;
         }
 
-        // Generally, vanilla-esque serializers should not produce this format, so it should be rare
+        // Generally, modern vanilla-esque serializers should not produce this format, so it should be rare
         // Lists are only used for lists of components ("extra" and "with")
         final ListTag processedListTag = new ListTag();
         for (final JsonElement entry : array) {