summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2013-03-20 11:11:29 -0500
committerTravis Watkins <amaranth@ubuntu.com>2013-03-20 11:11:47 -0500
commit6aaa1e83df796b7d380a22af3842f3aa4b367f4d (patch)
tree8db919b98a769b936184c7cef3630b1682bb4568 /src
parentb325ffc8f60de4d9f492221e057db2da1fc09060 (diff)
downloadcraftbukkit-6aaa1e83df796b7d380a22af3842f3aa4b367f4d.tar
craftbukkit-6aaa1e83df796b7d380a22af3842f3aa4b367f4d.tar.gz
craftbukkit-6aaa1e83df796b7d380a22af3842f3aa4b367f4d.tar.lz
craftbukkit-6aaa1e83df796b7d380a22af3842f3aa4b367f4d.tar.xz
craftbukkit-6aaa1e83df796b7d380a22af3842f3aa4b367f4d.zip
Really don't filter out -1 data in ItemStack.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/ItemStack.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 622f2991..68e481c6 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -40,10 +40,12 @@ public final class ItemStack {
this.f = null;
this.id = i;
this.count = j;
- this.setData(k); // CraftBukkit
- if (this.damage < 0) {
- this.damage = 0;
- }
+ // CraftBukkit start - pass to setData to do filtering
+ this.setData(k);
+ //if (this.damage < 0) {
+ // this.damage = 0;
+ //}
+ // CraftBukkit end
}
public static ItemStack createStack(NBTTagCompound nbttagcompound) {