Update CraftBukkit to Minecraft 1.4(.2).

1 files changed, 4 insertions, 4 deletions

diff --git a/src/main/java/net/minecraft/server/ContainerMerchant.java b/src/main/java/net/minecraft/server/ContainerMerchant.java
index 1f242ded..925718ff 100644
--- a/src/main/java/net/minecraft/server/ContainerMerchant.java
+++ b/src/main/java/net/minecraft/server/ContainerMerchant.java
@@ -60,15 +60,15 @@ public class ContainerMerchant extends Container {
         super.a(iinventory);
     }
 
-    public void c(int i) {
+    public void b(int i) {
         this.f.c(i);
     }
 
     public boolean c(EntityHuman entityhuman) {
-        return this.merchant.l_() == entityhuman;
+        return this.merchant.m_() == entityhuman;
     }
 
-    public ItemStack b(int i) {
+    public ItemStack b(EntityHuman entityhuman, int i) {
         ItemStack itemstack = null;
         Slot slot = (Slot) this.b.get(i);
 
@@ -104,7 +104,7 @@ public class ContainerMerchant extends Container {
                 return null;
             }
 
-            slot.b(itemstack1);
+            slot.a(entityhuman, itemstack1);
         }
 
         return itemstack;