diff --git a/CHANGELOG.md b/CHANGELOG.md index 41313d48a..ebcd9dbfc 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Refined Storage Changelog +### 0.8.2 +**Bugfixes** +- Fixed not being able to take items sometimes + ### 0.8.1 **Bugfixes** - Fixed upgrades from interface not dropping diff --git a/src/main/java/refinedstorage/RefinedStorageUtils.java b/src/main/java/refinedstorage/RefinedStorageUtils.java index 0be782fcb..45f5386ab 100755 --- a/src/main/java/refinedstorage/RefinedStorageUtils.java +++ b/src/main/java/refinedstorage/RefinedStorageUtils.java @@ -113,7 +113,7 @@ public final class RefinedStorageUtils { } if ((flags & CompareFlags.COMPARE_DAMAGE) == CompareFlags.COMPARE_DAMAGE) { - if (left.getItemDamage() != right.getItemDamage()) { + if (left.getMetadata() != right.getMetadata()) { return false; } } diff --git a/src/main/java/refinedstorage/apiimpl/network/GridHandler.java b/src/main/java/refinedstorage/apiimpl/network/GridHandler.java index 9096af562..85359af52 100755 --- a/src/main/java/refinedstorage/apiimpl/network/GridHandler.java +++ b/src/main/java/refinedstorage/apiimpl/network/GridHandler.java @@ -9,7 +9,6 @@ import refinedstorage.api.autocrafting.ICraftingTask; import refinedstorage.api.network.GridPullFlags; import refinedstorage.api.network.IGridHandler; import refinedstorage.api.network.INetworkMaster; -import refinedstorage.api.storage.CompareFlags; import refinedstorage.item.ItemWirelessGrid; public class GridHandler implements IGridHandler { @@ -45,11 +44,6 @@ public class GridHandler implements IGridHandler { ItemStack took = RefinedStorageUtils.takeFromNetwork(network, stack, size); - // Fallback for corner cases where NBT changes - if (took == null) { - took = network.take(stack, size, CompareFlags.COMPARE_DAMAGE); - } - if (took != null) { if ((flags & GridPullFlags.PULL_SHIFT) == GridPullFlags.PULL_SHIFT) { if (!player.inventory.addItemStackToInventory(took.copy())) {