summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/ShapedRecipes.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/net/minecraft/server/ShapedRecipes.java')
-rw-r--r--src/main/java/net/minecraft/server/ShapedRecipes.java12
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;
}
}