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/RecipeMapClone.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/RecipeMapClone.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/RecipeMapClone.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/RecipeMapClone.java b/src/main/java/net/minecraft/server/RecipeMapClone.java index 7e9e2c9d..793883fe 100644 --- a/src/main/java/net/minecraft/server/RecipeMapClone.java +++ b/src/main/java/net/minecraft/server/RecipeMapClone.java @@ -4,7 +4,7 @@ public class RecipeMapClone extends ShapelessRecipes implements IRecipe { // Cra // CraftBukkit start - Delegate to new parent class public RecipeMapClone() { - super(new ItemStack(Item.MAP, 0, -1), java.util.Arrays.asList(new ItemStack(Item.MAP_EMPTY, 0, 0))); + super(new ItemStack(Items.MAP, 0, -1), java.util.Arrays.asList(new ItemStack(Items.MAP_EMPTY, 0, 0))); } // CraftBukkit end @@ -16,14 +16,14 @@ public class RecipeMapClone extends ShapelessRecipes implements IRecipe { // Cra ItemStack itemstack1 = inventorycrafting.getItem(j); if (itemstack1 != null) { - if (itemstack1.id == Item.MAP.id) { + if (itemstack1.getItem() == Items.MAP) { if (itemstack != null) { return false; } itemstack = itemstack1; } else { - if (itemstack1.id != Item.MAP_EMPTY.id) { + if (itemstack1.getItem() != Items.MAP_EMPTY) { return false; } @@ -43,14 +43,14 @@ public class RecipeMapClone extends ShapelessRecipes implements IRecipe { // Cra ItemStack itemstack1 = inventorycrafting.getItem(j); if (itemstack1 != null) { - if (itemstack1.id == Item.MAP.id) { + if (itemstack1.getItem() == Items.MAP) { if (itemstack != null) { return null; } itemstack = itemstack1; } else { - if (itemstack1.id != Item.MAP_EMPTY.id) { + if (itemstack1.getItem() != Items.MAP_EMPTY) { return null; } @@ -60,7 +60,7 @@ public class RecipeMapClone extends ShapelessRecipes implements IRecipe { // Cra } if (itemstack != null && i >= 1) { - ItemStack itemstack2 = new ItemStack(Item.MAP, i + 1, itemstack.getData()); + ItemStack itemstack2 = new ItemStack(Items.MAP, i + 1, itemstack.getData()); if (itemstack.hasName()) { itemstack2.c(itemstack.getName()); |