Azimkin/CraftBukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPIGOT-7922: ExactChoice recipe fails to be added

Browse Source
This commit is contained in:
md_5 2024-10-23 19:38:39 +11:00
parent 097d63922a
commit d50f50585e
No known key found for this signature in database
GPG Key ID: E8E901AC7C617C11
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nms-patches/net/minecraft/world/item/crafting/RecipeItemStack.patch
View File

@ -16,9 +16,9 @@
+ return this.itemStacks; + return this.itemStacks;
+ } + }
+ +
+ public static RecipeItemStack ofStacks(Stream<ItemStack> stacks) { + public static RecipeItemStack ofStacks(List<ItemStack> stacks) {
+ RecipeItemStack recipe = RecipeItemStack.of(stacks.map(ItemStack::getItem)); + RecipeItemStack recipe = RecipeItemStack.of(stacks.stream().map(ItemStack::getItem));
+ recipe.itemStacks = stacks.toList(); + recipe.itemStacks = stacks;
+ return recipe; + return recipe;
+ } + }
+ // CraftBukkit end + // CraftBukkit end

2
src/main/java/org/bukkit/craftbukkit/inventory/CraftRecipe.java
View File

@ -33,7 +33,7 @@ public interface CraftRecipe extends Recipe {
} else if (bukkit instanceof RecipeChoice.MaterialChoice) { } else if (bukkit instanceof RecipeChoice.MaterialChoice) {
stack = RecipeItemStack.of(((RecipeChoice.MaterialChoice) bukkit).getChoices().stream().map((mat) -> CraftItemType.bukkitToMinecraft(mat))); stack = RecipeItemStack.of(((RecipeChoice.MaterialChoice) bukkit).getChoices().stream().map((mat) -> CraftItemType.bukkitToMinecraft(mat)));
} else if (bukkit instanceof RecipeChoice.ExactChoice) { } else if (bukkit instanceof RecipeChoice.ExactChoice) {
stack = RecipeItemStack.ofStacks(((RecipeChoice.ExactChoice) bukkit).getChoices().stream().map((mat) -> CraftItemStack.asNMSCopy(mat))); stack = RecipeItemStack.ofStacks(((RecipeChoice.ExactChoice) bukkit).getChoices().stream().map((mat) -> CraftItemStack.asNMSCopy(mat)).toList());
} else { } else {
throw new IllegalArgumentException("Unknown recipe stack instance " + bukkit); throw new IllegalArgumentException("Unknown recipe stack instance " + bukkit);
} }