dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #147

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-07-01 19:21:22 +02:00
parent fc5e89b506
commit 7906edf91f
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/refinedstorage/RefinedStorageUtils.java
View File

@@ -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;
}
}

6
src/main/java/refinedstorage/apiimpl/network/GridHandler.java
View File

@@ -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())) {