diff options
author | mbax <matt@phozop.net> | 2013-11-04 07:07:38 -0600 |
---|---|---|
committer | Wesley Wolfe <weswolf@aol.com> | 2013-11-30 19:26:12 -0600 |
commit | 2726696652179a5ead7dc07dd39edf7dfda687f7 (patch) | |
tree | ff78e22fdd4fc01889a5f6cc482b599f965cd93a /src/main/java/net/minecraft/server/InventoryMerchant.java | |
parent | ff8b70fbb7a96b9d2ff078afcf3b3ff90f200981 (diff) | |
download | craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.gz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.lz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.xz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.zip |
Update CraftBukkit to Minecraft 1.7.2
Diffstat (limited to 'src/main/java/net/minecraft/server/InventoryMerchant.java')
-rw-r--r-- | src/main/java/net/minecraft/server/InventoryMerchant.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/InventoryMerchant.java b/src/main/java/net/minecraft/server/InventoryMerchant.java index 9ab8fdc5..37eb8fae 100644 --- a/src/main/java/net/minecraft/server/InventoryMerchant.java +++ b/src/main/java/net/minecraft/server/InventoryMerchant.java @@ -115,11 +115,11 @@ public class InventoryMerchant implements IInventory { } } - public String getName() { + public String getInventoryName() { return "mob.villager"; } - public boolean c() { + public boolean k_() { return false; } @@ -128,12 +128,12 @@ public class InventoryMerchant implements IInventory { } public boolean a(EntityHuman entityhuman) { - return this.merchant.m_() == entityhuman; + return this.merchant.b() == entityhuman; } public void startOpen() {} - public void g() {} + public void l_() {} public boolean b(int i, ItemStack itemstack) { return true; |