From f6786cd44aa597f4b55beaae6baa498483435bd7 Mon Sep 17 00:00:00 2001 From: mezz Date: Mon, 13 Jun 2016 23:08:34 -0700 Subject: [PATCH] Fix #1289 Trade station price can show a negative stack in catalog --- .../forestry/core/network/DataInputStreamForestry.java | 2 +- .../core/network/DataOutputStreamForestry.java | 2 +- .../java/forestry/mail/gui/ContainerCatalogue.java | 10 +++++----- .../mail/network/packets/PacketLetterInfoResponse.java | 2 ++ 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/forestry/core/network/DataInputStreamForestry.java b/src/main/java/forestry/core/network/DataInputStreamForestry.java index d9ff43866..ee7aaf3f0 100644 --- a/src/main/java/forestry/core/network/DataInputStreamForestry.java +++ b/src/main/java/forestry/core/network/DataInputStreamForestry.java @@ -32,7 +32,7 @@ public class DataInputStreamForestry extends DataInputStream { if (!itemName.isEmpty()) { Item item = ItemStackUtil.getItemFromRegistry(itemName); - byte stackSize = readByte(); + int stackSize = readVarInt(); int meta = readVarInt(); itemstack = new ItemStack(item, stackSize, meta); diff --git a/src/main/java/forestry/core/network/DataOutputStreamForestry.java b/src/main/java/forestry/core/network/DataOutputStreamForestry.java index 7ece7c847..370ddfaac 100644 --- a/src/main/java/forestry/core/network/DataOutputStreamForestry.java +++ b/src/main/java/forestry/core/network/DataOutputStreamForestry.java @@ -26,7 +26,7 @@ public class DataOutputStreamForestry extends DataOutputStream { writeUTF(""); } else { writeUTF(ItemStackUtil.getItemNameFromRegistryAsString(itemstack.getItem())); - writeByte(itemstack.stackSize); + writeVarInt(itemstack.stackSize); writeVarInt(itemstack.getItemDamage()); if (itemstack.getItem().isDamageable() || itemstack.getItem().getShareTag()) { diff --git a/src/main/java/forestry/mail/gui/ContainerCatalogue.java b/src/main/java/forestry/mail/gui/ContainerCatalogue.java index 0ce4d0268..6b112a37d 100755 --- a/src/main/java/forestry/mail/gui/ContainerCatalogue.java +++ b/src/main/java/forestry/mail/gui/ContainerCatalogue.java @@ -47,7 +47,7 @@ public class ContainerCatalogue extends Container implements IGuiSelectable, ILe // for display on client private int stationCount; - private boolean needsSynch = true; + private boolean needsSync = true; private int currentFilter = 1; private static final String[] FILTER_NAMES = new String[]{"all", "online", "offline"}; @@ -158,7 +158,7 @@ public class ContainerCatalogue extends Container implements IGuiSelectable, ILe } else { setTradeInfo(null); } - needsSynch = true; + needsSync = true; } @Override @@ -178,7 +178,7 @@ public class ContainerCatalogue extends Container implements IGuiSelectable, ILe public void detectAndSendChanges() { super.detectAndSendChanges(); - if (needsSynch) { + if (needsSync) { for (IContainerListener crafter : listeners) { crafter.sendProgressBarUpdate(this, 0, stationIndex); crafter.sendProgressBarUpdate(this, 1, stations.size()); @@ -186,7 +186,7 @@ public class ContainerCatalogue extends Container implements IGuiSelectable, ILe } Proxies.net.sendToPlayer(new PacketLetterInfoResponse(EnumAddressee.TRADER, currentTrade, null), player); - needsSynch = false; + needsSync = false; } } @@ -225,6 +225,6 @@ public class ContainerCatalogue extends Container implements IGuiSelectable, ILe break; } - needsSynch = true; + needsSync = true; } } diff --git a/src/main/java/forestry/mail/network/packets/PacketLetterInfoResponse.java b/src/main/java/forestry/mail/network/packets/PacketLetterInfoResponse.java index c120740b8..9b906cf0d 100644 --- a/src/main/java/forestry/mail/network/packets/PacketLetterInfoResponse.java +++ b/src/main/java/forestry/mail/network/packets/PacketLetterInfoResponse.java @@ -110,6 +110,8 @@ public class PacketLetterInfoResponse extends ForestryPacket implements IForestr } type = EnumAddressee.fromString(data.readUTF()); + tradeInfo = null; + address = null; if (type == EnumAddressee.PLAYER) { if (data.readShort() < 0) {