mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-04 17:37:36 +02:00
a73ed9572e
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: b76ceb4f5 PR-1235: Move EntityType return to base Entity class e795d7490 SPIGOT-7458: Exception when Entity CommandSender executes Vanilla command 46c7fc3b1 SPIGOT-7452: Player#openSign cannot edit d91e5aa0b SPIGOT-7447: Rewrite --forceUpgrade to minimise diff and properly handle CraftBukkit world layout 921ae06d6 Revert "SPIGOT-7447: Fix --forceUpgrade" Spigot Changes: 94e187b5 Rebuild patches 3bce7935 SPIGOT-7091: Update bungeecord-chat
21 lines
1.1 KiB
Diff
21 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Redned <redned235@gmail.com>
|
|
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
|