Merge remote-tracking branch 'origin/master-1.19-lts' into master-1.19

CyclopsMC · May 13, 2023 · 524467e · 524467e
2 parents c20a902 + 611b312
commit 524467e
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/resources/changelog/1.18.2-1.1.2.txt 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
@@ -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
@@ -1049,6 +1049,7 @@ public static <T, M> List<T> 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 <T, M> List<T> getIngredientRecipeInputs(IIngredientComponentStora
                             if (inputReusable) {
                                 extractionMemoryReusableBuffer.add(inputPrototype.getPrototype());
                             }
+                            inputInstance = inputPrototype.getComponent().getMatcher().getEmptyInstance();
                             hasInputInstance = true;
                             shouldBreak = true;
                         }