From 9dfbe3b263d301bee8ffe2a5815c82673b9002b2 Mon Sep 17 00:00:00 2001 From: Matsv Date: Thu, 4 Jan 2018 15:41:10 +0100 Subject: [PATCH] Read FlatItem correctly & fix incoming Item type --- .../ViaVersion/api/type/types/minecraft/FlatItemType.java | 1 + .../protocols/protocolsnapshotto1_12_2/MetadataRewriter.java | 4 ---- .../protocolsnapshotto1_12_2/packets/InventoryPackets.java | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/common/src/main/java/us/myles/ViaVersion/api/type/types/minecraft/FlatItemType.java b/common/src/main/java/us/myles/ViaVersion/api/type/types/minecraft/FlatItemType.java index 9bb325341..a12df526d 100644 --- a/common/src/main/java/us/myles/ViaVersion/api/type/types/minecraft/FlatItemType.java +++ b/common/src/main/java/us/myles/ViaVersion/api/type/types/minecraft/FlatItemType.java @@ -17,6 +17,7 @@ public class FlatItemType extends BaseItemType { } else { Item item = new Item(); item.setId(id); + item.setAmount(buffer.readByte()); item.setTag(Type.NBT.read(buffer)); return item; } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/MetadataRewriter.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/MetadataRewriter.java index eebedbf8d..8f4c44240 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/MetadataRewriter.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/MetadataRewriter.java @@ -55,9 +55,5 @@ public class MetadataRewriter { } } } - - for (Metadata metadata : metadatas) { - System.out.println(metadata.getMetaType() instanceof MetaType1_13); - } } } diff --git a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/packets/InventoryPackets.java b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/packets/InventoryPackets.java index c115b465a..7a98f5e1f 100644 --- a/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/packets/InventoryPackets.java +++ b/common/src/main/java/us/myles/ViaVersion/protocols/protocolsnapshotto1_12_2/packets/InventoryPackets.java @@ -137,7 +137,7 @@ public class InventoryPackets { handler(new PacketHandler() { @Override public void handle(PacketWrapper wrapper) throws Exception { - Item item = wrapper.get(Type.FLAT_ITEM, 0); + Item item = wrapper.get(Type.ITEM, 0); toServer(item); } }); @@ -155,7 +155,7 @@ public class InventoryPackets { handler(new PacketHandler() { @Override public void handle(PacketWrapper wrapper) throws Exception { - Item item = wrapper.get(Type.FLAT_ITEM, 0); + Item item = wrapper.get(Type.ITEM, 0); toServer(item); } });