1 files changed, 32 insertions, 0 deletions
diff --git a/patch-remap/mache-spigotflower/net/minecraft/world/item/trading/Merchant.java.patch b/patch-remap/mache-spigotflower/net/minecraft/world/item/trading/Merchant.java.patch
new file mode 100644
index 0000000000..e01c6979e5
--- /dev/null
+++ b/patch-remap/mache-spigotflower/net/minecraft/world/item/trading/Merchant.java.patch
@@ -0,0 +1,32 @@
+--- a/net/minecraft/world/item/trading/Merchant.java
++++ b/net/minecraft/world/item/trading/Merchant.java
+@@ -36,20 +36,22 @@
+         return false;
+     }
+ 
+-    default void openTradingScreen(Player player, Component component, int i) {
+-        OptionalInt optionalint = player.openMenu(new SimpleMenuProvider((j, inventory, player1) -> {
+-            return new MerchantMenu(j, inventory, this);
+-        }, component));
++    default void openTradingScreen(Player player, Component displayName, int level) {
++        OptionalInt optionalint = player.openMenu(new SimpleMenuProvider((j, playerinventory, entityhuman1) -> {
++            return new MerchantMenu(j, playerinventory, this);
++        }, displayName));
+ 
+         if (optionalint.isPresent()) {
+-            MerchantOffers merchantoffers = this.getOffers();
++            MerchantOffers merchantrecipelist = this.getOffers();
+ 
+-            if (!merchantoffers.isEmpty()) {
+-                player.sendMerchantOffers(optionalint.getAsInt(), merchantoffers, i, this.getVillagerXp(), this.showProgressBar(), this.canRestock());
++            if (!merchantrecipelist.isEmpty()) {
++                player.sendMerchantOffers(optionalint.getAsInt(), merchantrecipelist, level, this.getVillagerXp(), this.showProgressBar(), this.canRestock());
+             }
+         }
+ 
+     }
+ 
+     boolean isClientSide();
++
++    org.bukkit.craftbukkit.inventory.CraftMerchant getCraftMerchant(); // CraftBukkit
+ }