Update CraftBukkit to Minecraft 1.7.2

1 files changed, 4 insertions, 3 deletions

diff --git a/src/main/java/net/minecraft/server/ContainerMerchant.java b/src/main/java/net/minecraft/server/ContainerMerchant.java
index 7424452d..444ec547 100644
--- a/src/main/java/net/minecraft/server/ContainerMerchant.java
+++ b/src/main/java/net/minecraft/server/ContainerMerchant.java
@@ -21,6 +21,7 @@ public class ContainerMerchant extends Container {
     }
     // CraftBukkit end
 
+
     public ContainerMerchant(PlayerInventory playerinventory, IMerchant imerchant, World world) {
         this.merchant = imerchant;
         this.g = world;
@@ -65,7 +66,7 @@ public class ContainerMerchant extends Container {
     }
 
     public boolean a(EntityHuman entityhuman) {
-        return this.merchant.m_() == entityhuman;
+        return this.merchant.b() == entityhuman;
     }
 
     public ItemStack b(EntityHuman entityhuman, int i) {
@@ -118,12 +119,12 @@ public class ContainerMerchant extends Container {
             ItemStack itemstack = this.f.splitWithoutUpdate(0);
 
             if (itemstack != null) {
-                entityhuman.drop(itemstack);
+                entityhuman.drop(itemstack, false);
             }
 
             itemstack = this.f.splitWithoutUpdate(1);
             if (itemstack != null) {
-                entityhuman.drop(itemstack);
+                entityhuman.drop(itemstack, false);
             }
         }
     }