diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2013-03-13 17:33:27 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2013-03-15 13:28:59 -0500 |
commit | 83d29e461c85733f0113b6eb19db6e3b42da2949 (patch) | |
tree | b3063a1c28f478ab368d5ba3413a842def68c28f /src/main/java/net/minecraft/server/ContainerMerchant.java | |
parent | ba6e4c38cfa98ad291974195cc46d70a4f138ac1 (diff) | |
download | craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.gz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.lz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.xz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.zip |
Update CraftBukkit to Minecraft 1.5
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 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); |