Update CraftBukkit to Minecraft 1.7.5

2014-03-20 22:26:30 -06:00
parent afb3511a4a
commit 385ace970e
206 changed files with 2670 additions and 2679 deletions
--- a/src/main/java/net/minecraft/server/ContainerMerchant.java
+++ b/src/main/java/net/minecraft/server/ContainerMerchant.java
@@ -73,7 +73,7 @@ public class ContainerMerchant extends Container {
        ItemStack itemstack = null;
        Slot slot = (Slot) this.c.get(i);

-        if (slot != null && slot.e()) {
+        if (slot != null && slot.hasItem()) {
            ItemStack itemstack1 = slot.getItem();

            itemstack = itemstack1.cloneItemStack();