From d1c275d35eb89519e9c537db42851352d3b60146 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Wed, 4 Oct 2017 00:15:51 +0200 Subject: [PATCH] Fixed not being able to extract Mekanism tanks and bins from the Grid, fixes #1415 --- CHANGELOG.md | 1 + .../apiimpl/network/grid/handler/ItemGridHandler.java | 3 ++- .../apiimpl/network/grid/handler/ItemGridHandlerPortable.java | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c89e76303..51dd2169c 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - Fixed Grid GUI crash (raoulvdberge) - Fixed device names overflowing Controller GUI (raoulvdberge) - Fixed high CPU load when Refined Storage GUIs are open (raoulvdberge) +- Fixed not being able to extract Mekanism tanks and bins from the Grid (raoulvdberge) ### 1.5.18 - Added Project E integration for the External Storage on the Transmutation Table (raoulvdberge) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java index 7b1859eab..db14eba9e 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java @@ -38,7 +38,8 @@ public class ItemGridHandler implements IItemGridHandler { } int itemSize = item.getCount(); - int maxItemSize = item.getItem().getItemStackLimit(item); + // We copy here because some mods change the NBT tag of an item after getting the stack limit + int maxItemSize = item.getItem().getItemStackLimit(item.copy()); boolean single = (flags & EXTRACT_SINGLE) == EXTRACT_SINGLE; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandlerPortable.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandlerPortable.java index 0755d3a88..cba608f6b 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandlerPortable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/grid/handler/ItemGridHandlerPortable.java @@ -38,7 +38,8 @@ public class ItemGridHandlerPortable implements IItemGridHandler { } int itemSize = item.getCount(); - int maxItemSize = item.getItem().getItemStackLimit(item); + // We copy here because some mods change the NBT tag of an item after getting the stack limit + int maxItemSize = item.getItem().getItemStackLimit(item.copy()); boolean single = (flags & EXTRACT_SINGLE) == EXTRACT_SINGLE;