1 files changed, 5 insertions, 5 deletions
diff --git a/patches/server/0425-Add-ignore-discounts-API.patch b/patches/server/0425-Add-ignore-discounts-API.patch
index 65a552a605..b2ed91d9bf 100644
--- a/patches/server/0425-Add-ignore-discounts-API.patch
+++ b/patches/server/0425-Add-ignore-discounts-API.patch
@@ -87,10 +87,10 @@ index 89982d25f60c8b60ba91e559ef88278f338fe215..0efc8d997b34302c3e0a5d7ec73a11a9
  
      public ItemStack getBaseCostA() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java
-index 86c5bc01d5b87b4301fb83d55cf3046985c45d0f..c9e23a71a35214c363318c48d38c49b695d1ffd4 100644
+index bc1a92707c65474c1464d6f7c3a3265df6195228..e86cee25703a3c02ef62e302816253c360d557f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMerchantRecipe.java
-@@ -22,11 +22,19 @@ public class CraftMerchantRecipe extends MerchantRecipe {
+@@ -24,11 +24,19 @@ public class CraftMerchantRecipe extends MerchantRecipe {
  
      @Deprecated
      public CraftMerchantRecipe(ItemStack result, int uses, int maxUses, boolean experienceReward, int experience, float priceMultiplier) {
@@ -112,7 +112,7 @@ index 86c5bc01d5b87b4301fb83d55cf3046985c45d0f..c9e23a71a35214c363318c48d38c49b6
          this.handle = new net.minecraft.world.item.trading.MerchantOffer(
                  new ItemCost(Items.AIR),
                  Optional.empty(),
-@@ -36,6 +44,7 @@ public class CraftMerchantRecipe extends MerchantRecipe {
+@@ -38,6 +46,7 @@ public class CraftMerchantRecipe extends MerchantRecipe {
                  experience,
                  priceMultiplier,
                  demand,
@@ -120,7 +120,7 @@ index 86c5bc01d5b87b4301fb83d55cf3046985c45d0f..c9e23a71a35214c363318c48d38c49b6
                  this
          );
          this.setSpecialPrice(specialPrice);
-@@ -112,6 +121,18 @@ public class CraftMerchantRecipe extends MerchantRecipe {
+@@ -114,6 +123,18 @@ public class CraftMerchantRecipe extends MerchantRecipe {
          this.handle.priceMultiplier = priceMultiplier;
      }
  
@@ -139,7 +139,7 @@ index 86c5bc01d5b87b4301fb83d55cf3046985c45d0f..c9e23a71a35214c363318c48d38c49b6
      public net.minecraft.world.item.trading.MerchantOffer toMinecraft() {
          List<ItemStack> ingredients = this.getIngredients();
          Preconditions.checkState(!ingredients.isEmpty(), "No offered ingredients");
-@@ -130,7 +151,7 @@ public class CraftMerchantRecipe extends MerchantRecipe {
+@@ -134,7 +155,7 @@ public class CraftMerchantRecipe extends MerchantRecipe {
          if (recipe instanceof CraftMerchantRecipe) {
              return (CraftMerchantRecipe) recipe;
          } else {