diff --git a/src/main/java/refinedstorage/api/network/NetworkMaster.java b/src/main/java/refinedstorage/api/network/NetworkMaster.java index 70de05f97..109c66c1c 100755 --- a/src/main/java/refinedstorage/api/network/NetworkMaster.java +++ b/src/main/java/refinedstorage/api/network/NetworkMaster.java @@ -26,6 +26,7 @@ import refinedstorage.block.EnumControllerType; import refinedstorage.container.ContainerGrid; import refinedstorage.item.ItemPattern; import refinedstorage.network.MessageGridItems; +import refinedstorage.tile.TileCable; import refinedstorage.tile.TileCrafter; import refinedstorage.tile.TileWirelessTransmitter; import refinedstorage.tile.config.RedstoneMode; @@ -289,7 +290,9 @@ public class NetworkMaster { slave.forceConnect(this); - slaves.add(slavePos); + if (!(slave instanceof TileCable)) { + slaves.add(slavePos); + } } this.slavesToLoad.clear(); @@ -668,6 +671,8 @@ public class NetworkMaster { } public void markDirty() { - NetworkMasterSavedData.getOrLoad(world).markDirty(); + if (world != null) { + NetworkMasterSavedData.getOrLoad(world).markDirty(); + } } } diff --git a/src/main/java/refinedstorage/tile/TileSlave.java b/src/main/java/refinedstorage/tile/TileSlave.java index 23680efe0..68aee547e 100755 --- a/src/main/java/refinedstorage/tile/TileSlave.java +++ b/src/main/java/refinedstorage/tile/TileSlave.java @@ -48,7 +48,9 @@ public abstract class TileSlave extends TileBase implements ISynchronizedContain this.network = network; this.connected = true; - this.network.addSlave(pos); + if (!(this instanceof TileCable)) { + this.network.addSlave(pos); + } world.notifyNeighborsOfStateChange(pos, getBlockType()); diff --git a/src/main/java/refinedstorage/tile/controller/StorageHandler.java b/src/main/java/refinedstorage/tile/controller/StorageHandler.java index ebe2c9ad6..c39398e6e 100755 --- a/src/main/java/refinedstorage/tile/controller/StorageHandler.java +++ b/src/main/java/refinedstorage/tile/controller/StorageHandler.java @@ -94,16 +94,12 @@ public class StorageHandler { int quantityPerRequest = 0; - System.out.println("stack:"+stack); CraftingPattern pattern = network.getPatternWithBestScore(stack); - System.out.println("pattern: " +pattern); if (pattern != null) { for (ItemStack output : pattern.getOutputs()) { - System.out.println("output:"+output); if (RefinedStorageUtils.compareStackNoQuantity(stack, output)) { quantityPerRequest += output.stackSize; - System.out.println("QPR:"+quantityPerRequest); if (!pattern.isProcessing()) { break; diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java index 186404574..3de81e3d8 100755 --- a/src/main/java/refinedstorage/tile/controller/TileController.java +++ b/src/main/java/refinedstorage/tile/controller/TileController.java @@ -65,7 +65,7 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr @Override public int getEnergyStored(EnumFacing from) { - return getNetwork().getEnergy().getEnergyStored(); + return getNetwork() != null ? getNetwork().getEnergy().getEnergyStored() : 0; } public int getEnergyScaled(int i) {