diff options
Diffstat (limited to 'nms-patches/ContainerMerchant.patch')
| -rw-r--r-- | nms-patches/ContainerMerchant.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nms-patches/ContainerMerchant.patch b/nms-patches/ContainerMerchant.patch index d06f0041..fdbef6a8 100644 --- a/nms-patches/ContainerMerchant.patch +++ b/nms-patches/ContainerMerchant.patch @@ -1,6 +1,6 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/ContainerMerchant.java 2014-11-28 17:43:43.017707437 +0000 -+++ src/main/java/net/minecraft/server/ContainerMerchant.java 2014-11-28 17:38:16.000000000 +0000 -@@ -1,10 +1,25 @@ +--- /home/matt/mc-dev-private//net/minecraft/server/ContainerMerchant.java 2015-02-26 22:40:22.423608141 +0000 ++++ src/main/java/net/minecraft/server/ContainerMerchant.java 2015-02-26 22:40:22.423608141 +0000 +@@ -1,11 +1,26 @@ package net.minecraft.server; +import org.bukkit.craftbukkit.inventory.CraftInventoryView; // CraftBukkit @@ -10,7 +10,7 @@ private IMerchant merchant; private InventoryMerchant f; private final World g; -+ + + // CraftBukkit start + private CraftInventoryView bukkitEntity = null; + private PlayerInventory player; @@ -23,9 +23,10 @@ + return bukkitEntity; + } + // CraftBukkit end - ++ public ContainerMerchant(PlayerInventory playerinventory, IMerchant imerchant, World world) { this.merchant = imerchant; + this.g = world; @@ -13,6 +28,7 @@ this.a(new Slot(this.f, 0, 36, 53)); this.a(new Slot(this.f, 1, 62, 53)); |