diff options
author | Nate Mortensen <nate.richard.mortensen@gmail.com> | 2013-07-01 06:03:00 -0500 |
---|---|---|
committer | Wesley Wolfe <weswolf@aol.com> | 2013-07-01 12:10:06 -0500 |
commit | 6c09066e224ac85b8a6464eaf8f53edfeb4beda4 (patch) | |
tree | 573e05f4b148cb1891a1d3839175e501e6257442 /src/main/java/net/minecraft/server/ContainerMerchant.java | |
parent | f887b76a259e12468b28d82d1eced93f0b73bd6d (diff) | |
download | craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.gz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.lz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.xz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.zip |
Update CraftBukkit to 1.6.1
Diffstat (limited to 'src/main/java/net/minecraft/server/ContainerMerchant.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ContainerMerchant.java | 6 |
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 2f256780..7424452d 100644 --- a/src/main/java/net/minecraft/server/ContainerMerchant.java +++ b/src/main/java/net/minecraft/server/ContainerMerchant.java @@ -72,7 +72,7 @@ public class ContainerMerchant extends Container { ItemStack itemstack = null; Slot slot = (Slot) this.c.get(i); - if (slot != null && slot.d()) { + if (slot != null && slot.e()) { ItemStack itemstack1 = slot.getItem(); itemstack = itemstack1.cloneItemStack(); @@ -97,7 +97,7 @@ public class ContainerMerchant extends Container { if (itemstack1.count == 0) { slot.set((ItemStack) null); } else { - slot.e(); + slot.f(); } if (itemstack1.count == itemstack.count) { @@ -112,7 +112,7 @@ public class ContainerMerchant extends Container { public void b(EntityHuman entityhuman) { super.b(entityhuman); - this.merchant.a((EntityHuman) null); + this.merchant.a_((EntityHuman) null); super.b(entityhuman); if (!this.g.isStatic) { ItemStack itemstack = this.f.splitWithoutUpdate(0); |