Update CraftBukkit to Minecraft 1.5

1 files changed, 3 insertions, 3 deletions

diff --git a/src/main/java/net/minecraft/server/ContainerMerchant.java b/src/main/java/net/minecraft/server/ContainerMerchant.java
index 0b97cf8b..2f256780 100644
--- a/src/main/java/net/minecraft/server/ContainerMerchant.java
+++ b/src/main/java/net/minecraft/server/ContainerMerchant.java
@@ -56,11 +56,11 @@ public class ContainerMerchant extends Container {
     }
 
     public void a(IInventory iinventory) {
-        this.f.g();
+        this.f.h();
         super.a(iinventory);
     }
 
-    public void b(int i) {
+    public void e(int i) {
         this.f.c(i);
     }
 
@@ -112,7 +112,7 @@ public class ContainerMerchant extends Container {
 
     public void b(EntityHuman entityhuman) {
         super.b(entityhuman);
-        this.merchant.b_((EntityHuman) null);
+        this.merchant.a((EntityHuman) null);
         super.b(entityhuman);
         if (!this.g.isStatic) {
             ItemStack itemstack = this.f.splitWithoutUpdate(0);