From 3f360705f22f8fa25f05efd2b35d9a5bc3ae5103 Mon Sep 17 00:00:00 2001 From: raoulvdberge Date: Fri, 1 Jun 2018 15:43:07 +0200 Subject: [PATCH] Remove useless check in external storage item handler. --- .../node/externalstorage/StorageItemItemHandler.java | 10 +--------- .../refinedstorage/block/BlockWirelessTransmitter.java | 1 - 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/StorageItemItemHandler.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/StorageItemItemHandler.java index fb39ba903..605619467 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/StorageItemItemHandler.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/externalstorage/StorageItemItemHandler.java @@ -6,7 +6,6 @@ import com.raoulvdberge.refinedstorage.tile.TileInterface; import com.raoulvdberge.refinedstorage.tile.config.IFilterable; import com.raoulvdberge.refinedstorage.util.StackUtils; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemHandlerHelper; @@ -25,14 +24,7 @@ public class StorageItemItemHandler extends StorageItemExternal { public StorageItemItemHandler(NetworkNodeExternalStorage externalStorage, Supplier handlerSupplier) { this.externalStorage = externalStorage; this.handlerSupplier = handlerSupplier; - - TileEntity tile = externalStorage.getFacingTile(); - - if (tile instanceof TileInterface) { - // Make sure we override our handler supplier so we don't get network items as well (which leads to unstable behavior) - this.handlerSupplier = ((TileInterface) tile).getNode()::getItems; - this.connectedToInterface = true; - } + this.connectedToInterface = externalStorage.getFacingTile() instanceof TileInterface; } public boolean isConnectedToInterface() { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java index 310a2b871..4c8ba65dd 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java @@ -24,7 +24,6 @@ import java.util.List; public class BlockWirelessTransmitter extends BlockNode { // From BlockTorch - // TODO: make consistent with shape private static final AxisAlignedBB WIRELESS_TRANSMITTER_AABB = new AxisAlignedBB(0.4000000059604645D, 0.0D, 0.4000000059604645D, 0.6000000238418579D, 0.6000000238418579D, 0.6000000238418579D); public BlockWirelessTransmitter() {