diff options
| author | Travis Watkins <amaranth@ubuntu.com> | 2012-10-24 22:53:23 -0500 |
|---|---|---|
| committer | EvilSeph <evilseph@gmail.com> | 2012-10-27 22:19:03 -0400 |
| commit | 60819c6693daf19dde68b04af38a4fee8c7da988 (patch) | |
| tree | e7bd96a07f0e9d9f1f6b2721ddd1bb5dd71eaf48 /src/main/java/net/minecraft/server/InventoryMerchant.java | |
| parent | b9a72531b6e2ccc84bd021bca421255a957d96f7 (diff) | |
| download | craftbukkit-60819c6693daf19dde68b04af38a4fee8c7da988.tar craftbukkit-60819c6693daf19dde68b04af38a4fee8c7da988.tar.gz craftbukkit-60819c6693daf19dde68b04af38a4fee8c7da988.tar.lz craftbukkit-60819c6693daf19dde68b04af38a4fee8c7da988.tar.xz craftbukkit-60819c6693daf19dde68b04af38a4fee8c7da988.zip | |
Update CraftBukkit to Minecraft 1.4(.2).
Diffstat (limited to 'src/main/java/net/minecraft/server/InventoryMerchant.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/InventoryMerchant.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/InventoryMerchant.java b/src/main/java/net/minecraft/server/InventoryMerchant.java index f1d7add0..1e238710 100644 --- a/src/main/java/net/minecraft/server/InventoryMerchant.java +++ b/src/main/java/net/minecraft/server/InventoryMerchant.java @@ -124,7 +124,7 @@ public class InventoryMerchant implements IInventory { } public boolean a(EntityHuman entityhuman) { - return this.merchant.l_() == entityhuman; + return this.merchant.m_() == entityhuman; } public void startOpen() {} @@ -153,12 +153,12 @@ public class InventoryMerchant implements IInventory { if (merchantrecipelist != null) { MerchantRecipe merchantrecipe = merchantrecipelist.a(itemstack, itemstack1, this.e); - if (merchantrecipe != null) { + if (merchantrecipe != null && !merchantrecipe.g()) { this.recipe = merchantrecipe; this.setItem(2, merchantrecipe.getBuyItem3().cloneItemStack()); } else if (itemstack1 != null) { merchantrecipe = merchantrecipelist.a(itemstack1, itemstack, this.e); - if (merchantrecipe != null) { + if (merchantrecipe != null && !merchantrecipe.g()) { this.recipe = merchantrecipe; this.setItem(2, merchantrecipe.getBuyItem3().cloneItemStack()); } else { |