From eb7eb4ba4709e9cb37717770fa44f78f0937b8c3 Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Thu, 15 Jun 2017 07:23:08 +1000 Subject: [PATCH] SPIGOT-3337: Use special data value to indicate multiple recipe choices By: md_5 --- paper-server/nms-patches/ShapedRecipes.patch | 2 +- paper-server/nms-patches/ShapelessRecipes.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/paper-server/nms-patches/ShapedRecipes.patch b/paper-server/nms-patches/ShapedRecipes.patch index 55e0cb11b..e5c8474d7 100644 --- a/paper-server/nms-patches/ShapedRecipes.patch +++ b/paper-server/nms-patches/ShapedRecipes.patch @@ -79,7 +79,7 @@ + for (RecipeItemStack list : this.items) { + if (list != null && list.choices.length > 0) { + net.minecraft.server.ItemStack stack = list.choices[0]; -+ recipe.setIngredient(c, org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(stack.getItem()), stack.getData()); ++ recipe.setIngredient(c, org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(stack.getItem()), (list.choices.length) > 1 ? 32767 : stack.getData()); + } + c++; + } diff --git a/paper-server/nms-patches/ShapelessRecipes.patch b/paper-server/nms-patches/ShapelessRecipes.patch index bb54a3d78..d91e17c72 100644 --- a/paper-server/nms-patches/ShapelessRecipes.patch +++ b/paper-server/nms-patches/ShapelessRecipes.patch @@ -37,7 +37,7 @@ + for (RecipeItemStack list : this.ingredients) { + if (list != null) { + net.minecraft.server.ItemStack stack = list.choices[0]; -+ recipe.addIngredient(org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(stack.getItem()), stack.getData()); ++ recipe.addIngredient(org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(stack.getItem()), (list.choices.length) > 1 ? 32767 : stack.getData()); + } + } + return recipe;