Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ private TickRateModulation doWork() {
IAEStack<?> itemToBegin = null;
int itemToBeginIdx = -1;

for (int j = 0; j < REQ_COUNT; ++j) {
req: for (int j = 0; j < REQ_COUNT; ++j) {
int i = (firstRequest + j) % REQ_COUNT;
if (requests[i] == null) continue;

Expand Down Expand Up @@ -248,8 +248,11 @@ private TickRateModulation doWork() {

// Walking every CPU to see whether the item is already being
// made is comparatively expensive
if (craftingGrid.isRequesting(craftItem)) {
continue;
for (ICraftingCPU cpu : craftingGrid.getCpus()) {
IAEStack<?> output = cpu.getFinalMultiOutput();
if (output != null && output.isSameType(craftItem)) {
continue req;
}
}

// do crafting
Expand Down