Chronika/Rekkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update CraftBukkit to Minecraft 1.4(.2).

Browse Source
This commit is contained in:
Travis Watkins
2012-10-24 22:53:23 -05:00
committed by EvilSeph
parent b9a72531b6
commit 60819c6693
237 changed files with 10104 additions and 4863 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minecraft/server/InventoryMerchant.java
View File

@@ -124,7 +124,7 @@ public class InventoryMerchant implements IInventory {
}
public boolean a(EntityHuman entityhuman) {
return this.merchant.l_() == entityhuman;
return this.merchant.m_() == entityhuman;
}
public void startOpen() {}
@@ -153,12 +153,12 @@ public class InventoryMerchant implements IInventory {
if (merchantrecipelist != null) {
MerchantRecipe merchantrecipe = merchantrecipelist.a(itemstack, itemstack1, this.e);
if (merchantrecipe != null) {
if (merchantrecipe != null && !merchantrecipe.g()) {
this.recipe = merchantrecipe;
this.setItem(2, merchantrecipe.getBuyItem3().cloneItemStack());
} else if (itemstack1 != null) {
merchantrecipe = merchantrecipelist.a(itemstack1, itemstack, this.e);
if (merchantrecipe != null) {
if (merchantrecipe != null && !merchantrecipe.g()) {
this.recipe = merchantrecipe;
this.setItem(2, merchantrecipe.getBuyItem3().cloneItemStack());
} else {