aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRedned <[email protected]>2023-06-21 08:11:50 -0500
committerGitHub <[email protected]>2023-06-21 14:11:50 +0100
commitc613877e54c3b57f919ffb5a52426f6800b4af39 (patch)
tree690e0942ca6cc4df1b3b39085574130f1ed1c6eb
parent3756f5bbf566fde4aa619bf8d4215f68567621d3 (diff)
downloadPaper-c613877e54c3b57f919ffb5a52426f6800b4af39.tar.gz
Paper-c613877e54c3b57f919ffb5a52426f6800b4af39.zip
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.
-rw-r--r--patches/server/0978-Fix-incorrect-crafting-result-amount-for-fireworks.patch20
-rw-r--r--patches/server/0979-Properly-Cancel-Usable-Items.patch (renamed from patches/server/0978-Properly-Cancel-Usable-Items.patch)0
2 files changed, 20 insertions, 0 deletions
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 <[email protected]>
+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
index 306ce8eeac..306ce8eeac 100644
--- a/patches/server/0978-Properly-Cancel-Usable-Items.patch
+++ b/patches/server/0979-Properly-Cancel-Usable-Items.patch