summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/InventoryMerchant.java
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2012-11-06 06:05:28 -0600
committerTravis Watkins <amaranth@ubuntu.com>2012-11-13 16:09:52 -0600
commit7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7 (patch)
tree843902ff94d82e86f40d7e0af1ac838fee859e75 /src/main/java/net/minecraft/server/InventoryMerchant.java
parenta0c3b4f9d1b403fa64230f22b5dd3222181ba646 (diff)
downloadcraftbukkit-7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7.tar
craftbukkit-7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7.tar.gz
craftbukkit-7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7.tar.lz
craftbukkit-7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7.tar.xz
craftbukkit-7f7192f8fd8357e664e7e2d6e7c5f65fd0fcd2f7.zip
Update CraftBukkit to Minecraft 1.4.4.
Diffstat (limited to 'src/main/java/net/minecraft/server/InventoryMerchant.java')
-rw-r--r--src/main/java/net/minecraft/server/InventoryMerchant.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/InventoryMerchant.java b/src/main/java/net/minecraft/server/InventoryMerchant.java
index 1e238710..99726746 100644
--- a/src/main/java/net/minecraft/server/InventoryMerchant.java
+++ b/src/main/java/net/minecraft/server/InventoryMerchant.java
@@ -123,7 +123,7 @@ public class InventoryMerchant implements IInventory {
return maxStack; // CraftBukkit
}
- public boolean a(EntityHuman entityhuman) {
+ public boolean a_(EntityHuman entityhuman) {
return this.merchant.m_() == entityhuman;
}