From b00154aad7035860ecc44f8edf3c2a2632845492 Mon Sep 17 00:00:00 2001 From: Shanyu Juneja Date: Fri, 23 Oct 2020 14:23:34 +0200 Subject: [PATCH] Fixed ItemStack converter --- .../buffer/types/minecraft/ItemStackConverter.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/cc/ghast/packet/buffer/types/minecraft/ItemStackConverter.java b/src/main/java/cc/ghast/packet/buffer/types/minecraft/ItemStackConverter.java index 893a36b..9d270cc 100644 --- a/src/main/java/cc/ghast/packet/buffer/types/minecraft/ItemStackConverter.java +++ b/src/main/java/cc/ghast/packet/buffer/types/minecraft/ItemStackConverter.java @@ -35,9 +35,13 @@ public void write(MutableByteBuf buffer, ItemStack value) { @Override public ItemStack read(MutableByteBuf buffer, Object... args) throws IOException { short id = buffer.readShort(); - byte amount = buffer.readByte(); - Object tag = Converters.NMS_NBT.read(buffer); - WrappedItem item = new WrappedItem(id, amount, tag); - return ReflectUtil.getItemFromWrapper(item); + if (id >= 0) { + byte amount = buffer.readByte(); + short data = buffer.readShort(); + Object tag = Converters.NMS_NBT.read(buffer); + WrappedItem item = new WrappedItem(id, amount, data, tag); + return ReflectUtil.getItemFromWrapper(item); + } + return null; } }