summaryrefslogtreecommitdiffstats
path: root/nms-patches/ContainerMerchant.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nms-patches/ContainerMerchant.patch')
-rw-r--r--nms-patches/ContainerMerchant.patch9
1 files changed, 4 insertions, 5 deletions
diff --git a/nms-patches/ContainerMerchant.patch b/nms-patches/ContainerMerchant.patch
index 7cd43434..3610204f 100644
--- a/nms-patches/ContainerMerchant.patch
+++ b/nms-patches/ContainerMerchant.patch
@@ -1,14 +1,13 @@
--- a/net/minecraft/server/ContainerMerchant.java
+++ b/net/minecraft/server/ContainerMerchant.java
-@@ -1,6 +1,7 @@
+@@ -1,11 +1,26 @@
package net.minecraft.server;
- import javax.annotation.Nullable;
+import org.bukkit.craftbukkit.inventory.CraftInventoryView; // CraftBukkit
-
++
public class ContainerMerchant extends Container {
-@@ -8,6 +9,19 @@
+ private final IMerchant merchant;
private final InventoryMerchant f;
private final World g;
@@ -28,7 +27,7 @@
public ContainerMerchant(PlayerInventory playerinventory, IMerchant imerchant, World world) {
this.merchant = imerchant;
this.g = world;
-@@ -15,6 +29,7 @@
+@@ -13,6 +28,7 @@
this.a(new Slot(this.f, 0, 36, 53));
this.a(new Slot(this.f, 1, 62, 53));
this.a((Slot) (new SlotMerchantResult(playerinventory.player, imerchant, this.f, 2, 120, 53)));