Skip to content

Commit a49945e

Browse files
committed
Merge remote-tracking branch 'origin/master-1.19-lts' into master-1.19
2 parents 9a68ab6 + 0f23871 commit a49945e

3 files changed

Lines changed: 14 additions & 1 deletion

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
As always, don't forget to backup your world before updating!
2+
Requires CyclopsCore version 1.13.4 or higher.
3+
4+
Fixes:
5+
* Fix input not consumed if output can not fully fit, Closes #31
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
As always, don't forget to backup your world before updating!
2+
Requires CyclopsCore version 1.17.0 or higher.
3+
4+
Fixes:
5+
* Fix input not consumed if output can not fully fit, Closes #31

src/main/java/org/cyclops/structuredcrafting/craft/WorldCraftingMatrix.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,10 @@ public boolean craft(boolean simulate) {
143143

144144
// Determine output
145145
if(chosenPossibility != null && !itemStack.isEmpty()
146-
&& addItemStackForOutput(level, targetPos, targetSide, outputProviders, itemStack, simulate)) {
146+
&& addItemStackForOutput(level, targetPos, targetSide, outputProviders, itemStack, true)) {
147+
if (!simulate) {
148+
addItemStackForOutput(level, targetPos, targetSide, outputProviders, itemStack, simulate);
149+
}
147150
chosenPossibility.handleRemainingItems(level, inputSide, simulate);
148151
return true;
149152
}

0 commit comments

Comments
 (0)