From d8e18c8ffd472423afdf1294eb28ac7da51dee0d Mon Sep 17 00:00:00 2001 From: Ruben Taelman Date: Sat, 17 Sep 2022 10:22:10 +0200 Subject: [PATCH] Fix ignore storage contents overriding ignore crafting jobs Closes #87 --- .../part/aspect/CraftingAspectWriteBuilders.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/cyclops/integratedcrafting/part/aspect/CraftingAspectWriteBuilders.java b/src/main/java/org/cyclops/integratedcrafting/part/aspect/CraftingAspectWriteBuilders.java index 1bf67dbe..0284e75c 100644 --- a/src/main/java/org/cyclops/integratedcrafting/part/aspect/CraftingAspectWriteBuilders.java +++ b/src/main/java/org/cyclops/integratedcrafting/part/aspect/CraftingAspectWriteBuilders.java @@ -153,10 +153,10 @@ public static IAspectValuePropagator, Void> PROP_CR boolean craftMissing = properties.getValue(PROP_CRAFT_MISSING).getRawValue(); int craftDelay = properties.getValue(PROP_CRAFT_DELAY).getRawValue(); - if (ignoreStorage || !CraftingHelpers.hasStorageInstance(network, channel, - ingredientComponent, instance, ingredientComponent.getMatcher().getExactMatchCondition()) - && (ignoreCrafting || !CraftingHelpers.isCrafting(craftingNetwork, channel, ingredientComponent, - instance, matchCondition))) { + if ((ignoreStorage || !CraftingHelpers.hasStorageInstance(network, channel, ingredientComponent, + instance, ingredientComponent.getMatcher().getExactMatchCondition())) + && (ignoreCrafting || !CraftingHelpers.isCrafting(craftingNetwork, channel, + ingredientComponent, instance, matchCondition))) { // Handle craft delay (only if we are checking storage) boolean allowCraft; if (craftDelay > 0 && !ignoreStorage) {