diff --git a/patches/api/0429-Fix-NPE-on-Boat-getStatus.patch b/patches/api/0430-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/api/0429-Fix-NPE-on-Boat-getStatus.patch rename to patches/api/0430-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/api/0430-Expand-Pose-API.patch b/patches/api/0431-Expand-Pose-API.patch similarity index 100% rename from patches/api/0430-Expand-Pose-API.patch rename to patches/api/0431-Expand-Pose-API.patch diff --git a/patches/api/0432-MerchantRecipe-add-copy-constructor.patch b/patches/api/0432-MerchantRecipe-add-copy-constructor.patch new file mode 100644 index 0000000000..1c5ba2803c --- /dev/null +++ b/patches/api/0432-MerchantRecipe-add-copy-constructor.patch @@ -0,0 +1,24 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Joo200 +Date: Tue, 20 Dec 2022 15:26:36 +0100 +Subject: [PATCH] MerchantRecipe: add copy constructor + + +diff --git a/src/main/java/org/bukkit/inventory/MerchantRecipe.java b/src/main/java/org/bukkit/inventory/MerchantRecipe.java +index afaa21b9347683fa373a938d9b1aa01c2058192a..39f9766a03d420340d79841197f75c8b1dd49f4a 100644 +--- a/src/main/java/org/bukkit/inventory/MerchantRecipe.java ++++ b/src/main/java/org/bukkit/inventory/MerchantRecipe.java +@@ -91,6 +91,13 @@ public class MerchantRecipe implements Recipe { + this.specialPrice = specialPrice; + } + ++ // Paper start - add copy ctor ++ public MerchantRecipe(@NotNull MerchantRecipe recipe) { ++ this(recipe.result.clone(), recipe.uses, recipe.maxUses, recipe.experienceReward, recipe.villagerExperience, recipe.priceMultiplier, recipe.demand, recipe.specialPrice, recipe.ignoreDiscounts); ++ this.setIngredients(recipe.ingredients); ++ } ++ // Paper end ++ + @NotNull + @Override + public ItemStack getResult() { diff --git a/patches/server/1015-Fix-NPE-on-Boat-getStatus.patch b/patches/server/1016-Fix-NPE-on-Boat-getStatus.patch similarity index 100% rename from patches/server/1015-Fix-NPE-on-Boat-getStatus.patch rename to patches/server/1016-Fix-NPE-on-Boat-getStatus.patch diff --git a/patches/server/1016-Expand-Pose-API.patch b/patches/server/1017-Expand-Pose-API.patch similarity index 100% rename from patches/server/1016-Expand-Pose-API.patch rename to patches/server/1017-Expand-Pose-API.patch