diff options
| author | Nate Mortensen <nate.richard.mortensen@gmail.com> | 2013-07-01 06:03:00 -0500 |
|---|---|---|
| committer | Wesley Wolfe <weswolf@aol.com> | 2013-07-01 12:10:06 -0500 |
| commit | 6c09066e224ac85b8a6464eaf8f53edfeb4beda4 (patch) | |
| tree | 573e05f4b148cb1891a1d3839175e501e6257442 /src/main/java/net/minecraft/server/TileEntityBrewingStand.java | |
| parent | f887b76a259e12468b28d82d1eced93f0b73bd6d (diff) | |
| download | craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.gz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.lz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.xz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.zip | |
Update CraftBukkit to 1.6.1
Diffstat (limited to 'src/main/java/net/minecraft/server/TileEntityBrewingStand.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/TileEntityBrewingStand.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java index 2d943bef..f1883f37 100644 --- a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java +++ b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java @@ -103,7 +103,7 @@ public class TileEntityBrewingStand extends TileEntity implements IWorldInventor if (this.items[3] != null && this.items[3].count > 0) { ItemStack itemstack = this.items[3]; - if (!Item.byId[itemstack.id].w()) { + if (!Item.byId[itemstack.id].x()) { return false; } else { boolean flag = false; @@ -121,7 +121,8 @@ public class TileEntityBrewingStand extends TileEntity implements IWorldInventor List list = Item.POTION.c(j); List list1 = Item.POTION.c(k); - if ((j <= 0 || list != list1) && (list == null || !list.equals(list1) && list1 != null) && j != k) { + // CraftBukkit - list != -> !list.equals + if ((j <= 0 || !list.equals(list1)) && (list == null || !list.equals(list1) && list1 != null) && j != k) { flag = true; break; } @@ -166,8 +167,8 @@ public class TileEntityBrewingStand extends TileEntity implements IWorldInventor } } - if (Item.byId[itemstack.id].t()) { - this.items[3] = new ItemStack(Item.byId[itemstack.id].s()); + if (Item.byId[itemstack.id].u()) { + this.items[3] = new ItemStack(Item.byId[itemstack.id].t()); } else { --this.items[3].count; if (this.items[3].count <= 0) { @@ -178,7 +179,7 @@ public class TileEntityBrewingStand extends TileEntity implements IWorldInventor } private int c(int i, ItemStack itemstack) { - return itemstack == null ? i : (Item.byId[itemstack.id].w() ? PotionBrewer.a(i, Item.byId[itemstack.id].v()) : i); + return itemstack == null ? i : (Item.byId[itemstack.id].x() ? PotionBrewer.a(i, Item.byId[itemstack.id].w()) : i); } public void a(NBTTagCompound nbttagcompound) { @@ -268,7 +269,7 @@ public class TileEntityBrewingStand extends TileEntity implements IWorldInventor public void g() {} public boolean b(int i, ItemStack itemstack) { - return i == 3 ? Item.byId[itemstack.id].w() : itemstack.id == Item.POTION.id || itemstack.id == Item.GLASS_BOTTLE.id; + return i == 3 ? Item.byId[itemstack.id].x() : itemstack.id == Item.POTION.id || itemstack.id == Item.GLASS_BOTTLE.id; } public int j() { |