From f5bb30559ddc7d00180ab0608fe18acf7b372ff1 Mon Sep 17 00:00:00 2001
From: KennyTV <kennytv@t-online.de>
Date: Tue, 30 Jun 2020 17:09:46 +0200
Subject: [PATCH] Make map data type read consistent

---
 .../protocol1_11_1to1_12/packets/BlockItemPackets1_12.java | 4 ++--
 .../protocol1_15_2to1_16/packets/BlockItemPackets1_16.java | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java
index 3db9c1bd..0ede4f7c 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/BlockItemPackets1_12.java
@@ -57,8 +57,8 @@ public class BlockItemPackets1_12 extends LegacyBlockItemRewriter<Protocol1_11_1
                         if (columns <= 0) return;
 
                         short rows = wrapper.passthrough(Type.UNSIGNED_BYTE);
-                        wrapper.passthrough(Type.BYTE);  //X
-                        wrapper.passthrough(Type.BYTE);  //Z
+                        wrapper.passthrough(Type.UNSIGNED_BYTE); // X
+                        wrapper.passthrough(Type.UNSIGNED_BYTE); // Z
                         byte[] data = wrapper.read(Type.BYTE_ARRAY_PRIMITIVE);
                         for (int i = 0; i < data.length; i++) {
                             short color = (short) (data[i] & 0xFF);
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java
index 4ef50c23..19c92812 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_15_2to1_16/packets/BlockItemPackets1_16.java
@@ -231,16 +231,15 @@ public class BlockItemPackets1_16 extends nl.matsv.viabackwards.api.rewriters.It
                     short columns = wrapper.passthrough(Type.UNSIGNED_BYTE);
                     if (columns < 1) return;
 
-                    wrapper.passthrough(Type.BYTE); // Rows
-                    wrapper.passthrough(Type.BYTE); // X
-                    wrapper.passthrough(Type.BYTE); // Z
+                    wrapper.passthrough(Type.UNSIGNED_BYTE); // Rows
+                    wrapper.passthrough(Type.UNSIGNED_BYTE); // X
+                    wrapper.passthrough(Type.UNSIGNED_BYTE); // Z
                     byte[] data = wrapper.passthrough(Type.BYTE_ARRAY_PRIMITIVE);
                     for (int i = 0; i < data.length; i++) {
                         int color = data[i] & 0xFF;
                         int mappedColor = MapColorRewriter.getMappedColor(color);
                         if (mappedColor != -1) {
                             data[i] = (byte) mappedColor;
-                            System.out.println(color + " -> " + mappedColor);
                         }
                     }
                 });