diff options
author | mbax <matt@phozop.net> | 2013-11-04 07:07:38 -0600 |
---|---|---|
committer | Wesley Wolfe <weswolf@aol.com> | 2013-11-30 19:26:12 -0600 |
commit | 2726696652179a5ead7dc07dd39edf7dfda687f7 (patch) | |
tree | ff78e22fdd4fc01889a5f6cc482b599f965cd93a /src/main/java/net/minecraft/server/ShapedRecipes.java | |
parent | ff8b70fbb7a96b9d2ff078afcf3b3ff90f200981 (diff) | |
download | craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.gz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.lz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.xz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.zip |
Update CraftBukkit to Minecraft 1.7.2
Diffstat (limited to 'src/main/java/net/minecraft/server/ShapedRecipes.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ShapedRecipes.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/main/java/net/minecraft/server/ShapedRecipes.java b/src/main/java/net/minecraft/server/ShapedRecipes.java index 8f4246b0..cc444db8 100644 --- a/src/main/java/net/minecraft/server/ShapedRecipes.java +++ b/src/main/java/net/minecraft/server/ShapedRecipes.java @@ -11,11 +11,9 @@ public class ShapedRecipes implements IRecipe { private int height; private ItemStack[] items; private ItemStack result; - public final int a; - private boolean f; + private boolean e; public ShapedRecipes(int i, int j, ItemStack[] aitemstack, ItemStack itemstack) { - this.a = itemstack.id; this.width = i; this.height = j; this.items = aitemstack; @@ -70,7 +68,7 @@ public class ShapedRecipes implements IRecipe { char c = 'a'; for (ItemStack stack : this.items) { if (stack != null) { - recipe.setIngredient(c, org.bukkit.Material.getMaterial(stack.id), stack.getData()); + recipe.setIngredient(c, org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(stack.getItem()), stack.getData()); } c++; } @@ -120,7 +118,7 @@ public class ShapedRecipes implements IRecipe { return false; } - if (itemstack.id != itemstack1.id) { + if (itemstack.getItem() != itemstack1.getItem()) { return false; } @@ -137,7 +135,7 @@ public class ShapedRecipes implements IRecipe { public ItemStack a(InventoryCrafting inventorycrafting) { ItemStack itemstack = this.b().cloneItemStack(); - if (this.f) { + if (this.e) { for (int i = 0; i < inventorycrafting.getSize(); ++i) { ItemStack itemstack1 = inventorycrafting.getItem(i); @@ -155,7 +153,7 @@ public class ShapedRecipes implements IRecipe { } public ShapedRecipes c() { - this.f = true; + this.e = true; return this; } } |