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

Couple fix for bugs founded. (#790)

Browse Source 
* Fixed crash placing importer

* Fixing exporter's regulator mode loop using wrong index variable
This commit is contained in:
InusualZ
2016-12-28 03:55:04 +11:00
committed by Raoul
parent da4b55ac6d
commit 1f0d74e6ea
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeExporter.java
View File

@@ -97,12 +97,13 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy
boolean skipSlot = false; boolean skipSlot = false;
if (regulator) { if (regulator) {
for (int index = 0; i < handler.getSlots() && !skipSlot; i++) { for (int index = 0; index < handler.getSlots(); index++) {
ItemStack exporterStack = handler.getStackInSlot(index); ItemStack exporterStack = handler.getStackInSlot(index);
if (API.instance().getComparer().isEqual(slot, exporterStack, compare)) { if (API.instance().getComparer().isEqual(slot, exporterStack, compare)) {
if (exporterStack.getCount() >= slot.getCount()) { if (exporterStack.getCount() >= slot.getCount()) {
skipSlot = true; skipSlot = true;
break;
} else { } else {
stackSize = upgrades.hasUpgrade(ItemUpgrade.TYPE_STACK) ? slot.getCount() - exporterStack.getCount() : 1; stackSize = upgrades.hasUpgrade(ItemUpgrade.TYPE_STACK) ? slot.getCount() - exporterStack.getCount() : 1;
} }

4
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java
View File

@@ -51,6 +51,10 @@ public class NetworkNodeImporter extends NetworkNode implements IComparable, IFi
@Override @Override
public void update() { public void update() {
if (network == null) {
return;
}
if (type == IType.ITEMS) { if (type == IType.ITEMS) {
TileEntity tile = holder.world().getTileEntity(holder.pos().offset(holder.getDirection())); TileEntity tile = holder.world().getTileEntity(holder.pos().offset(holder.getDirection()));
IItemHandler handler = RSUtils.getItemHandler(tile, holder.getDirection().getOpposite()); IItemHandler handler = RSUtils.getItemHandler(tile, holder.getDirection().getOpposite());