From c5e9a169fa564f3b8119b6666f8df59d5a9b45c3 Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 10 May 2016 21:47:39 +1000 Subject: Minecraft 1.9.4 --- nms-patches/ContainerMerchant.patch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'nms-patches/ContainerMerchant.patch') diff --git a/nms-patches/ContainerMerchant.patch b/nms-patches/ContainerMerchant.patch index 362f8d77..92b1aede 100644 --- a/nms-patches/ContainerMerchant.patch +++ b/nms-patches/ContainerMerchant.patch @@ -1,13 +1,14 @@ --- a/net/minecraft/server/ContainerMerchant.java +++ b/net/minecraft/server/ContainerMerchant.java -@@ -1,11 +1,26 @@ +@@ -1,6 +1,7 @@ package net.minecraft.server; + import javax.annotation.Nullable; +import org.bukkit.craftbukkit.inventory.CraftInventoryView; // CraftBukkit -+ + public class ContainerMerchant extends Container { - private IMerchant merchant; +@@ -8,6 +9,19 @@ private InventoryMerchant f; private final World g; @@ -27,7 +28,7 @@ public ContainerMerchant(PlayerInventory playerinventory, IMerchant imerchant, World world) { this.merchant = imerchant; this.g = world; -@@ -13,6 +28,7 @@ +@@ -15,6 +29,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))); -- cgit v1.2.3