From 4cd70ee7111a67ce2246a0a4e33a86844cd234da Mon Sep 17 00:00:00 2001 From: creeper123123321 Date: Wed, 22 Aug 2018 17:27:21 -0300 Subject: [PATCH] Fix rewriting --- common/src/main/java/us/myles/ViaVersion/api/type/Type.java | 1 + .../protocol1_13_1to1_13/packets/InventoryPackets.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/us/myles/ViaVersion/api/type/Type.java b/common/src/main/java/us/myles/ViaVersion/api/type/Type.java index 1c34a46fe..3202b27d0 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/type/Type.java +++ b/common/src/main/java/us/myles/ViaVersion/api/type/Type.java @@ -77,6 +77,7 @@ public abstract class Type implements ByteBufReader, ByteBufWriter { /* 1.13 Flat Item (no data) */ public static final Type FLAT_ITEM = new FlatItemType(); public static final Type FLAT_ITEM_ARRAY = new FlatItemArrayType(); + public static final Type FLAT_ITEM_ARRAY_VAR_INT = new ArrayType<>(FLAT_ITEM); /* Actual Class */ diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1to1_13/packets/InventoryPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1to1_13/packets/InventoryPackets.java index 98f827e83..117e3cf47 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1to1_13/packets/InventoryPackets.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocol1_13_1to1_13/packets/InventoryPackets.java @@ -120,7 +120,7 @@ public class InventoryPackets { wrapper.passthrough(Type.STRING); // Group int ingredientsNo = wrapper.passthrough(Type.VAR_INT); for (int i1 = 0; i1 < ingredientsNo; i1++) { - Item[] items = wrapper.passthrough(Type.FLAT_ITEM_ARRAY); + Item[] items = wrapper.passthrough(Type.FLAT_ITEM_ARRAY_VAR_INT); for (int i2 = 0; i2 < items.length; i2++) { InventoryPackets.toClient(items[i2]); } @@ -130,7 +130,7 @@ public class InventoryPackets { int ingredientsNo = wrapper.passthrough(Type.VAR_INT) * wrapper.passthrough(Type.VAR_INT); wrapper.passthrough(Type.STRING); // Group for (int i1 = 0; i1 < ingredientsNo; i1++) { - Item[] items = wrapper.passthrough(Type.FLAT_ITEM_ARRAY); + Item[] items = wrapper.passthrough(Type.FLAT_ITEM_ARRAY_VAR_INT); for (int i2 = 0; i2 < items.length; i2++) { InventoryPackets.toClient(items[i2]); } @@ -139,7 +139,7 @@ public class InventoryPackets { } else if (type.equals("smelting")) { wrapper.passthrough(Type.STRING); // Group // Ingredient start - Item[] items = wrapper.passthrough(Type.FLAT_ITEM_ARRAY); + Item[] items = wrapper.passthrough(Type.FLAT_ITEM_ARRAY_VAR_INT); for (int i2 = 0; i2 < items.length; i2++) { InventoryPackets.toClient(items[i2]); }