From c613877e54c3b57f919ffb5a52426f6800b4af39 Mon Sep 17 00:00:00 2001 From: Redned Date: Wed, 21 Jun 2023 08:11:50 -0500 Subject: [PATCH] Fix incorrect crafting result amount for fireworks (#9322) Although vanilla does not specifically call this method anywhere, this fixes a bug where the result using the Bukkit API returns the wrong amount. --- ...crafting-result-amount-for-fireworks.patch | 20 +++++++++++++++++++ ...> 0979-Properly-Cancel-Usable-Items.patch} | 0 2 files changed, 20 insertions(+) create mode 100644 patches/server/0978-Fix-incorrect-crafting-result-amount-for-fireworks.patch rename patches/server/{0978-Properly-Cancel-Usable-Items.patch => 0979-Properly-Cancel-Usable-Items.patch} (100%) diff --git a/patches/server/0978-Fix-incorrect-crafting-result-amount-for-fireworks.patch b/patches/server/0978-Fix-incorrect-crafting-result-amount-for-fireworks.patch new file mode 100644 index 0000000000..a34e772338 --- /dev/null +++ b/patches/server/0978-Fix-incorrect-crafting-result-amount-for-fireworks.patch @@ -0,0 +1,20 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Redned +Date: Mon, 12 Jun 2023 11:54:12 -0500 +Subject: [PATCH] Fix incorrect crafting result amount for fireworks + +Although vanilla does not specifically call this method anywhere, this fixes a bug where the result using the Bukkit API returns the wrong amount. + +diff --git a/src/main/java/net/minecraft/world/item/crafting/FireworkRocketRecipe.java b/src/main/java/net/minecraft/world/item/crafting/FireworkRocketRecipe.java +index 5296f47a7e344ac59664a48e8ce91240393c7e12..b611ce69defe0dfa69c43f138b20d107c3f46c05 100644 +--- a/src/main/java/net/minecraft/world/item/crafting/FireworkRocketRecipe.java ++++ b/src/main/java/net/minecraft/world/item/crafting/FireworkRocketRecipe.java +@@ -82,7 +82,7 @@ public class FireworkRocketRecipe extends CustomRecipe { + + @Override + public ItemStack getResultItem(RegistryAccess registryManager) { +- return new ItemStack(Items.FIREWORK_ROCKET); ++ return new ItemStack(Items.FIREWORK_ROCKET, 3); // Paper - Fix incorrect crafting result amount + } + + @Override diff --git a/patches/server/0978-Properly-Cancel-Usable-Items.patch b/patches/server/0979-Properly-Cancel-Usable-Items.patch similarity index 100% rename from patches/server/0978-Properly-Cancel-Usable-Items.patch rename to patches/server/0979-Properly-Cancel-Usable-Items.patch