diff options
author | Spottedleaf <[email protected]> | 2024-10-25 12:47:52 -0700 |
---|---|---|
committer | Spottedleaf <[email protected]> | 2024-10-25 13:05:26 -0700 |
commit | e4efb590e49d30c9abe606838572aa5b4e9b5572 (patch) | |
tree | 9b60f27fd5f94daa2ea0a24edef90eb52c5811ea /patches/api/0410-MerchantRecipe-add-copy-constructor.patch | |
parent | 2e76d3f1e200c567e62337e0d50ddcb01e3ea895 (diff) | |
download | Paper-e4efb590e49d30c9abe606838572aa5b4e9b5572.tar.gz Paper-e4efb590e49d30c9abe606838572aa5b4e9b5572.zip |
fix compile issues
Diffstat (limited to 'patches/api/0410-MerchantRecipe-add-copy-constructor.patch')
-rw-r--r-- | patches/api/0410-MerchantRecipe-add-copy-constructor.patch | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/patches/api/0410-MerchantRecipe-add-copy-constructor.patch b/patches/api/0410-MerchantRecipe-add-copy-constructor.patch deleted file mode 100644 index 1c5ba2803c..0000000000 --- a/patches/api/0410-MerchantRecipe-add-copy-constructor.patch +++ /dev/null @@ -1,24 +0,0 @@ -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() { |