mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-24 09:56:48 +02:00
e1c0033552
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 Bukkit Changes: 2b4b6d14 PR-1023: Convert InventoryView to interface CraftBukkit Changes: 68603b1c1 Use expanded interaction ranges for traced interact events eae9f760c PR-1414: Convert InventoryView to interface ee9eafe67 Fix Implementation for DamageSource#isIndirect for internal custom causing entity
24 lines
1.1 KiB
Diff
24 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Joo200 <github@joo200.de>
|
|
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() {
|