Update CraftBukkit to 1.6.1

2013-07-01 06:03:00 -05:00
parent f887b76a25
commit 6c09066e22
228 changed files with 6426 additions and 5442 deletions
--- a/src/main/java/net/minecraft/server/InventoryMerchant.java
+++ b/src/main/java/net/minecraft/server/InventoryMerchant.java
@@ -177,6 +177,8 @@ public class InventoryMerchant implements IInventory {
                }
            }
        }
+
+        this.merchant.a_(this.getItem(2));
    }

    public MerchantRecipe getRecipe() {