Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.7.2

Browse Source
This commit is contained in:
mbax
2013-11-04 07:07:38 -06:00
committed by Wesley Wolfe
parent ff8b70fbb7
commit 2726696652
349 changed files with 14339 additions and 11287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/minecraft/server/ContainerMerchant.java
View File

@@ -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);
}
}
}