From 24557bc2b37deb6a0edf497d547471832457b1dd Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Wed, 26 Nov 2014 08:32:16 +1100
Subject: Update to Minecraft 1.8

For more information please see http://www.spigotmc.org/
---
 nms-patches/ContainerMerchant.patch | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 nms-patches/ContainerMerchant.patch

(limited to 'nms-patches/ContainerMerchant.patch')

diff --git a/nms-patches/ContainerMerchant.patch b/nms-patches/ContainerMerchant.patch
new file mode 100644
index 00000000..d62ffe9e
--- /dev/null
+++ b/nms-patches/ContainerMerchant.patch
@@ -0,0 +1,36 @@
+--- ../work/decompile-bb26c12b/net/minecraft/server/ContainerMerchant.java	2014-11-27 08:59:46.617422217 +1100
++++ src/main/java/net/minecraft/server/ContainerMerchant.java	2014-11-27 08:42:10.136850942 +1100
+@@ -1,10 +1,25 @@
+ package net.minecraft.server;
+ 
++import org.bukkit.craftbukkit.inventory.CraftInventoryView; // CraftBukkit
++
+ public class ContainerMerchant extends Container {
+ 
+     private IMerchant merchant;
+     private InventoryMerchant f;
+     private final World g;
++    
++    // CraftBukkit start
++    private CraftInventoryView bukkitEntity = null;
++    private PlayerInventory player;
++
++    @Override
++    public CraftInventoryView getBukkitView() {
++        if (bukkitEntity == null) {
++            bukkitEntity = new CraftInventoryView(this.player.player.getBukkitEntity(), new org.bukkit.craftbukkit.inventory.CraftInventoryMerchant((InventoryMerchant) f), this);
++        }
++        return bukkitEntity;
++    }
++    // CraftBukkit end
+ 
+     public ContainerMerchant(PlayerInventory playerinventory, IMerchant imerchant, World world) {
+         this.merchant = imerchant;
+@@ -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)));
++        this.player = playerinventory; // CraftBukkit - save player
+ 
+         int i;
+ 
-- 
cgit v1.2.3