summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/ItemStack.java
diff options
context:
space:
mode:
authorTahg <tahgtahv@gmail.com>2011-09-26 03:07:06 -0400
committerTahg <tahgtahv@gmail.com>2011-09-26 03:07:46 -0400
commitd226e551ae7b77bc002e6686a36a6374ed515fbc (patch)
tree1b7e23dc7338b928e29cbd453bf0ef68fd7f125b /src/main/java/net/minecraft/server/ItemStack.java
parentb7c43fbff1dffef1b4c9c4e57633d8c16606db58 (diff)
downloadcraftbukkit-d226e551ae7b77bc002e6686a36a6374ed515fbc.tar
craftbukkit-d226e551ae7b77bc002e6686a36a6374ed515fbc.tar.gz
craftbukkit-d226e551ae7b77bc002e6686a36a6374ed515fbc.tar.lz
craftbukkit-d226e551ae7b77bc002e6686a36a6374ed515fbc.tar.xz
craftbukkit-d226e551ae7b77bc002e6686a36a6374ed515fbc.zip
data improvements
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemStack.java')
-rw-r--r--src/main/java/net/minecraft/server/ItemStack.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index eb4f2b30..65747732 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -5,7 +5,7 @@ public final class ItemStack {
public int count;
public int b;
public int id;
- public int damage; // CraftBukkit - private -> public
+ private int damage;
public ItemStack(Block block) {
this(block, 1);
@@ -35,7 +35,7 @@ public final class ItemStack {
this.count = 0;
this.id = i;
this.count = j;
- this.damage = k;
+ b(k); // CraftBukkit
}
public static ItemStack a(NBTTagCompound nbttagcompound) {
@@ -122,7 +122,7 @@ public final class ItemStack {
}
public void b(int i) {
- this.damage = i;
+ this.damage = (id > 0) && (id < 256) ? Item.byId[id].filterData(i) : i; // CraftBukkit
}
public int i() {