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

Fixed crash when configuring an Exporter, fixes #1413

Browse Source
This commit is contained in:
raoulvdberge
2017-08-09 23:44:20 +02:00
parent 1f6f18770a
commit 4d48953e3f
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -2,6 +2,7 @@
### 1.5.16 ### 1.5.16
- Fixed crash when placing a Controller (raoulvdberge) - Fixed crash when placing a Controller (raoulvdberge)
- Fixed crash when configuring an Exporter (raoulvdberge)
### 1.5.15 ### 1.5.15
- Updated Forge to 2444 (MC 1.12.1) (raoulvdberge) - Updated Forge to 2444 (MC 1.12.1) (raoulvdberge)

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

@@ -150,13 +150,15 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy
if (took != null && ItemHandlerHelper.insertItem(handler, took, true).isEmpty()) { if (took != null && ItemHandlerHelper.insertItem(handler, took, true).isEmpty()) {
took = network.extractItem(slot, 1, compare, false); took = network.extractItem(slot, 1, compare, false);
ItemHandlerHelper.insertItem(handler, took, false); if (took != null) {
ItemHandlerHelper.insertItem(handler, took, false);
craftOnlyToExtract[i]--; craftOnlyToExtract[i]--;
if (craftOnlyToExtract[i] <= 0) { if (craftOnlyToExtract[i] <= 0) {
craftOnlyToExtract[i] = null; craftOnlyToExtract[i] = null;
craftOnlyTask[i] = null; craftOnlyTask[i] = null;
}
} }
} }
} else if (!network.getCraftingManager().getTasks().contains(craftOnlyTask[i])) { } else if (!network.getCraftingManager().getTasks().contains(craftOnlyTask[i])) {
@@ -188,7 +190,9 @@ public class NetworkNodeExporter extends NetworkNode implements IComparable, ITy
} else if (ItemHandlerHelper.insertItem(handler, took, true).isEmpty()) { } else if (ItemHandlerHelper.insertItem(handler, took, true).isEmpty()) {
took = network.extractItem(slot, upgrades.getItemInteractCount(), compare, false); took = network.extractItem(slot, upgrades.getItemInteractCount(), compare, false);
ItemHandlerHelper.insertItem(handler, took, false); if (took != null) {
ItemHandlerHelper.insertItem(handler, took, false);
}
} }
} }
} }