From 8a2c18863ce478ad9f5102451355e07755ad3533 Mon Sep 17 00:00:00 2001
From: Nassim Jahnke <nassim@njahnke.dev>
Date: Tue, 5 Dec 2023 22:23:48 +0100
Subject: [PATCH] Fix map marker reading

---
 .../protocol1_20_2to1_20_3/Protocol1_20_2To1_20_3.java        | 2 +-
 .../rewriter/BlockItemPacketRewriter1_20_2.java               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_2to1_20_3/Protocol1_20_2To1_20_3.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_2to1_20_3/Protocol1_20_2To1_20_3.java
index 3f3ff1f3..fa9174a1 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_2to1_20_3/Protocol1_20_2To1_20_3.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20_2to1_20_3/Protocol1_20_2To1_20_3.java
@@ -173,7 +173,7 @@ public final class Protocol1_20_2To1_20_3 extends BackwardsProtocol<ClientboundP
             if (wrapper.passthrough(Type.BOOLEAN)) {
                 final int icons = wrapper.passthrough(Type.VAR_INT);
                 for (int i = 0; i < icons; i++) {
-                    wrapper.passthrough(Type.BYTE); // Type
+                    wrapper.passthrough(Type.VAR_INT); // Type
                     wrapper.passthrough(Type.BYTE); // X
                     wrapper.passthrough(Type.BYTE); // Y
                     wrapper.passthrough(Type.BYTE); // Rotation
diff --git a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20to1_20_2/rewriter/BlockItemPacketRewriter1_20_2.java b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20to1_20_2/rewriter/BlockItemPacketRewriter1_20_2.java
index 8a26b967..b942dcd8 100644
--- a/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20to1_20_2/rewriter/BlockItemPacketRewriter1_20_2.java
+++ b/common/src/main/java/com/viaversion/viabackwards/protocol/protocol1_20to1_20_2/rewriter/BlockItemPacketRewriter1_20_2.java
@@ -83,8 +83,8 @@ public final class BlockItemPacketRewriter1_20_2 extends ItemRewriter<Clientboun
                 final int icons = wrapper.passthrough(Type.VAR_INT);
                 for (int i = 0; i < icons; i++) {
                     // Map new marker types to red marker
-                    final byte markerType = wrapper.read(Type.BYTE);
-                    wrapper.write(Type.BYTE, markerType < 27 ? markerType : 2);
+                    final int markerType = wrapper.read(Type.VAR_INT);
+                    wrapper.write(Type.VAR_INT, markerType < 27 ? markerType : 2);
 
                     wrapper.passthrough(Type.BYTE); // X
                     wrapper.passthrough(Type.BYTE); // Y