aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/api/0410-MerchantRecipe-add-copy-constructor.patch
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2024-10-27 09:43:00 +0100
committerNassim Jahnke <[email protected]>2024-10-27 10:03:59 +0100
commit348c8550967380d9843e365e769f67eee8a8e474 (patch)
tree185991293a5343239e1107ebc98df37de3d020a5 /patches/api/0410-MerchantRecipe-add-copy-constructor.patch
parentbcf52fe5fd7b178e3c72f53762c8e32ca7910dc4 (diff)
downloadPaper-348c8550967380d9843e365e769f67eee8a8e474.tar.gz
Paper-348c8550967380d9843e365e769f67eee8a8e474.zip
Readd last API patch (with TODO)
Diffstat (limited to 'patches/api/0410-MerchantRecipe-add-copy-constructor.patch')
-rw-r--r--patches/api/0410-MerchantRecipe-add-copy-constructor.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/patches/api/0410-MerchantRecipe-add-copy-constructor.patch b/patches/api/0410-MerchantRecipe-add-copy-constructor.patch
new file mode 100644
index 0000000000..1c5ba2803c
--- /dev/null
+++ b/patches/api/0410-MerchantRecipe-add-copy-constructor.patch
@@ -0,0 +1,24 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Joo200 <[email protected]>
+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() {