Skip to content

Commit

Permalink
Fix ignore storage contents overriding ignore crafting jobs
Browse files Browse the repository at this point in the history
Closes #87
  • Loading branch information
rubensworks committed Sep 17, 2022
1 parent 4624e9a commit d8e18c8
Showing 1 changed file with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,10 @@ public static <T, M> IAspectValuePropagator<CraftingJobData<T, M>, 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) {
Expand Down

0 comments on commit d8e18c8

Please sign in to comment.