Update CraftBukkit to Minecraft 1.4(.2).

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

View File

@@ -81,7 +81,7 @@ public class ShapedRecipes implements IRecipe {
return this.result;
}
public boolean a(InventoryCrafting inventorycrafting) {
public boolean a(InventoryCrafting inventorycrafting, World world) {
for (int i = 0; i <= 3 - this.width; ++i) {
for (int j = 0; j <= 3 - this.height; ++j) {
if (this.a(inventorycrafting, i, j, true)) {
@@ -133,8 +133,8 @@ public class ShapedRecipes implements IRecipe {
return true;
}
public ItemStack b(InventoryCrafting inventorycrafting) {
return new ItemStack(this.result.id, this.result.count, this.result.getData(), this.result.getEnchantments()); // CraftBukkit - copy enchantments
public ItemStack a(InventoryCrafting inventorycrafting) {
return this.b().cloneItemStack();
}
public int a() {