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/ShapelessRecipes.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/ShapelessRecipes.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/ShapelessRecipes.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/ShapelessRecipes.java b/src/main/java/net/minecraft/server/ShapelessRecipes.java index fbdad807..0fab83c6 100644 --- a/src/main/java/net/minecraft/server/ShapelessRecipes.java +++ b/src/main/java/net/minecraft/server/ShapelessRecipes.java @@ -26,7 +26,7 @@ public class ShapelessRecipes implements IRecipe { CraftShapelessRecipe recipe = new CraftShapelessRecipe(result, this); for (ItemStack stack : (List<ItemStack>) this.ingredients) { if (stack != null) { - recipe.addIngredient(org.bukkit.Material.getMaterial(stack.id), stack.getData()); + recipe.addIngredient(org.bukkit.craftbukkit.util.CraftMagicNumbers.getMaterial(stack.getItem()), stack.getData()); } } return recipe; @@ -51,7 +51,7 @@ public class ShapelessRecipes implements IRecipe { while (iterator.hasNext()) { ItemStack itemstack1 = (ItemStack) iterator.next(); - if (itemstack.id == itemstack1.id && (itemstack1.getData() == 32767 || itemstack.getData() == itemstack1.getData())) { + if (itemstack.getItem() == itemstack1.getItem() && (itemstack1.getData() == 32767 || itemstack.getData() == itemstack1.getData())) { flag = true; arraylist.remove(itemstack1); break; |