mirror of
https://github.com/PaperMC/Paper.git
synced 2025-12-05 04:54:44 +01:00
Merge 40b8167260 into 84a789b263
This commit is contained in:
commit
3cb1bcadce
@ -1,11 +1,14 @@
|
||||
--- a/net/minecraft/world/inventory/ResultSlot.java
|
||||
+++ b/net/minecraft/world/inventory/ResultSlot.java
|
||||
@@ -72,7 +_,7 @@
|
||||
@@ -72,9 +_,9 @@
|
||||
private NonNullList<ItemStack> getRemainingItems(CraftingInput input, Level level) {
|
||||
return level instanceof ServerLevel serverLevel
|
||||
? serverLevel.recipeAccess()
|
||||
- .getRecipeFor(RecipeType.CRAFTING, input, serverLevel)
|
||||
+ .getRecipeFor(RecipeType.CRAFTING, input, serverLevel, this.craftSlots.getCurrentRecipe()) // Paper - Perf: Improve mass crafting; check last recipe used first
|
||||
.map(recipe -> recipe.value().getRemainingItems(input))
|
||||
.orElseGet(() -> copyAllInputItems(input))
|
||||
- .orElseGet(() -> copyAllInputItems(input))
|
||||
+ .orElseGet(() -> CraftingRecipe.defaultCraftingReminder(input)) // Paper - Fix #1822: Return default remainder when recipe is null
|
||||
: CraftingRecipe.defaultCraftingReminder(input);
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user