From 1f3ed39eb67f1b0644bf0d8bf1c480939fd16830 Mon Sep 17 00:00:00 2001
From: creeper123123321 <creeper123123321@gmail.com>
Date: Sat, 30 Mar 2019 14:39:45 -0300
Subject: [PATCH 1/3] fix toServer

---
 .../protocol1_12_2to1_13/packets/BlockItemPackets1_13.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java
index f6102ff4..e1dcb99c 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java
@@ -867,7 +867,6 @@ public class BlockItemPackets1_13 extends BlockItemRewriter<Protocol1_12_2To1_13
 
     @Override
     protected Item handleItemToServer(Item item) {
-        item = super.handleItemToServer(item);
         if (item == null) return null;
         CompoundTag tag = item.getTag();
 
@@ -1095,6 +1094,7 @@ public class BlockItemPackets1_13 extends BlockItemRewriter<Protocol1_12_2To1_13
 
         item.setId(MappingData.oldToNewItems.get(rawId).shortValue());
         item.setData((short) 0);
+        item = super.handleItemToServer(item);
         return item;
     }
 

From 6f20b874c56ab31e7c3b1319657c3134189d242c Mon Sep 17 00:00:00 2001
From: creeper123123321 <creeper123123321@gmail.com>
Date: Sat, 30 Mar 2019 15:08:31 -0300
Subject: [PATCH 2/3] fix possible array out of bounds

---
 .../protocol/protocol1_12_2to1_13/data/SoundMapping.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/SoundMapping.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/SoundMapping.java
index c9096b01..80dcd2c4 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/SoundMapping.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/data/SoundMapping.java
@@ -39,6 +39,6 @@ public class SoundMapping {
     }
 
     public static int getOldSound(int newSound) {
-        return newSound >= sounds.length ? -1 : sounds[newSound];
+        return newSound < 0 || newSound >= sounds.length ? -1 : sounds[newSound];
     }
 }

From 77efe57015e315eafe014e4e9fa2a5db9562c7af Mon Sep 17 00:00:00 2001
From: creeper123123321 <creeper123123321@gmail.com>
Date: Sat, 30 Mar 2019 16:33:02 -0300
Subject: [PATCH 3/3] fix tag name conflict

---
 .../protocol1_12_2to1_13/packets/BlockItemPackets1_13.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java
index e1dcb99c..790e5206 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java
@@ -76,7 +76,7 @@ public class BlockItemPackets1_13 extends BlockItemRewriter<Protocol1_12_2To1_13
 
     @Override
     protected void registerPackets(Protocol1_12_2To1_13 protocol) {
-        NBT_TAG_NAME = "ViaBackwards|" + protocol.getClass().getSimpleName();
+        NBT_TAG_NAME = "ViaBackwards|" + protocol.getClass().getSimpleName() + "|Part2";
         // Block Action
         protocol.out(State.PLAY, 0x0A, 0x0A, new PacketRemapper() {
             @Override