From 96c560db788fc0d50b59d6ea914f06926c74a097 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Thu, 18 May 2017 20:32:39 +0200 Subject: [PATCH] Fixed #1227 - "Portable Grid Dupe" --- CHANGELOG.md | 3 +++ .../tile/grid/portable/TilePortableGrid.java | 14 ++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49b197ba3..d73d4a448 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Refined Storage Changelog +### 1.4.7 +- Fixed bug where Portable Grid would dupe in inventory (raoulvdberge) + ### 1.4.6 - Performance improvement to network scanning (raoulvdberge) - Removed debug output from 1.4.5 (raoulvdberge) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java index ef30b2110..3199c9697 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/grid/portable/TilePortableGrid.java @@ -224,14 +224,16 @@ public class TilePortableGrid extends TileBase implements IGrid, IPortableGrid, this.energyStorage.setEnergyStored(stack.getCapability(CapabilityEnergy.ENERGY, null).getEnergyStored()); - for (int i = 0; i < 4; ++i) { - RSUtils.readItems(filter, i, stack.getTagCompound()); + if (stack.hasTagCompound()) { + for (int i = 0; i < 4; ++i) { + RSUtils.readItems(filter, i, stack.getTagCompound()); + } + + RSUtils.readItems(disk, 4, stack.getTagCompound()); + + this.redstoneMode = RedstoneMode.read(stack.getTagCompound()); } - RSUtils.readItems(disk, 4, stack.getTagCompound()); - - this.redstoneMode = RedstoneMode.read(stack.getTagCompound()); - markDirty(); }