diff --git a/resources/changelog/1.18.2-1.1.2.txt b/resources/changelog/1.18.2-1.1.2.txt new file mode 100644 index 00000000..80936c0a --- /dev/null +++ b/resources/changelog/1.18.2-1.1.2.txt @@ -0,0 +1,6 @@ +As always, don't forget to backup your world before updating! +Requires CyclopsCore version 1.13.4 or higher. + +Fixes: +* Fix rare crash with reusable ingredients, Closes #94 + diff --git a/resources/changelog/1.19.2-1.1.2.txt b/resources/changelog/1.19.2-1.1.2.txt new file mode 100644 index 00000000..f2a6b4ea --- /dev/null +++ b/resources/changelog/1.19.2-1.1.2.txt @@ -0,0 +1,6 @@ +As always, don't forget to backup your world before updating! +Requires CyclopsCore version 1.17.0 or higher. + +Fixes: +* Fix rare crash with reusable ingredients, Closes #94 + diff --git a/src/main/java/org/cyclops/integratedcrafting/core/CraftingHelpers.java b/src/main/java/org/cyclops/integratedcrafting/core/CraftingHelpers.java index 31c843ff..3850e7f2 100644 --- a/src/main/java/org/cyclops/integratedcrafting/core/CraftingHelpers.java +++ b/src/main/java/org/cyclops/integratedcrafting/core/CraftingHelpers.java @@ -1049,6 +1049,7 @@ public static List getIngredientRecipeInputs(IIngredientComponentStora long prototypeQuantity = matcher.getQuantity(inputPrototype.getPrototype()); if (inputReusable && extractionMemoryReusable.contains(inputPrototype.getPrototype())) { // If the reusable item has been extracted before, mark as valid, and don't extract again. + inputInstance = inputPrototype.getComponent().getMatcher().getEmptyInstance(); hasInputInstance = true; shouldBreak = true; } else { @@ -1097,6 +1098,7 @@ public static List getIngredientRecipeInputs(IIngredientComponentStora if (inputReusable) { extractionMemoryReusableBuffer.add(inputPrototype.getPrototype()); } + inputInstance = inputPrototype.getComponent().getMatcher().getEmptyInstance(); hasInputInstance = true; shouldBreak = true; }