diff --git a/CHANGELOG.md b/CHANGELOG.md index 75b5decc3..004ce8b69 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Made all IO blocks have a blacklist instead of a whitelist by default (raoulvdberge) - An empty blacklist now means: accept any item. An empty whitelist now means: don't accept any item (an empty whitelist USED to mean: accept any item) (raoulvdberge) - Any mod can now add JSON Solderer recipes without requiring the API, by putting the JSONs in their assets directory in a "solderer_recipes" directory (raoulvdberge) +- The Importer now skips over empty slots (raoulvdberge) - Updated Russian translation (kellixon) ### 1.5.34 diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java index b27e36c54..d5dbded1a 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeImporter.java @@ -72,9 +72,13 @@ public class NetworkNodeImporter extends NetworkNode implements IComparable, IFi } if (handler.getSlots() > 0) { + while (currentSlot + 1 < handler.getSlots() && handler.getStackInSlot(currentSlot).isEmpty()) { + currentSlot++; + } + ItemStack stack = handler.getStackInSlot(currentSlot); - if (stack.isEmpty() || !IFilterable.canTake(itemFilters, mode, compare, stack)) { + if (!IFilterable.canTake(itemFilters, mode, compare, stack)) { currentSlot++; } else if (ticks % upgrades.getSpeed() == 0) { ItemStack result = handler.extractItem(currentSlot, upgrades.getItemInteractCount(), true);