From c186d13ae58a0a7747673014f890fd0cca9a4ea4 Mon Sep 17 00:00:00 2001
From: KennyTV <28825609+KennyTV@users.noreply.github.com>
Date: Sat, 6 Jul 2019 19:36:50 +0200
Subject: [PATCH] Fix trade item rewrites

---
 .../protocol1_13_2to1_14/packets/BlockItemPackets1_14.java    | 1 -
 .../protocol1_13to1_13_1/packets/InventoryPackets1_13_1.java  | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java
index bfe8dcab..b0fb9ff7 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13_2to1_14/packets/BlockItemPackets1_14.java
@@ -185,7 +185,6 @@ public class BlockItemPackets1_14 extends BlockItemRewriter<Protocol1_13_2To1_14
                     @Override
                     public void handle(PacketWrapper wrapper) throws Exception {
                         wrapper.write(Type.STRING, "minecraft:trader_list");
-                        // wrapper.read(Type.STRING); // Remove channel
 
                         int windowId = wrapper.read(Type.VAR_INT);
                         wrapper.write(Type.INT, windowId);
diff --git a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/InventoryPackets1_13_1.java b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/InventoryPackets1_13_1.java
index 058037e7..8a22358f 100644
--- a/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/InventoryPackets1_13_1.java
+++ b/core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_13to1_13_1/packets/InventoryPackets1_13_1.java
@@ -70,13 +70,13 @@ public class InventoryPackets1_13_1 {
                                 toClient(input);
                                 //Output Item
                                 Item output = wrapper.passthrough(Type.FLAT_ITEM);
-                                toClient(input);
+                                toClient(output);
 
                                 boolean secondItem = wrapper.passthrough(Type.BOOLEAN); //Has second item
                                 if (secondItem) {
                                     //Second Item
                                     Item second = wrapper.passthrough(Type.FLAT_ITEM);
-                                    toClient(input);
+                                    toClient(second);
                                 }
 
                                 wrapper.passthrough(Type.BOOLEAN); //Trade disabled