summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/ItemStack.java
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2013-03-20 09:41:16 -0500
committerTravis Watkins <amaranth@ubuntu.com>2013-03-20 09:44:17 -0500
commit2fc755cc6526bc3e17222608e817e2e58cccf669 (patch)
treef1d75bce07ed4871d732fb70ce192d0faa3e15b3 /src/main/java/net/minecraft/server/ItemStack.java
parent26d1f9189a1c15d7e34e83582b2b9b81f6919cd0 (diff)
downloadcraftbukkit-2fc755cc6526bc3e17222608e817e2e58cccf669.tar
craftbukkit-2fc755cc6526bc3e17222608e817e2e58cccf669.tar.gz
craftbukkit-2fc755cc6526bc3e17222608e817e2e58cccf669.tar.lz
craftbukkit-2fc755cc6526bc3e17222608e817e2e58cccf669.tar.xz
craftbukkit-2fc755cc6526bc3e17222608e817e2e58cccf669.zip
Don't filter out -1 data in ItemStack. Fixes BUKKIT-3824
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemStack.java')
-rw-r--r--src/main/java/net/minecraft/server/ItemStack.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 389558cf..622f2991 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -156,7 +156,7 @@ public final class ItemStack {
return;
}
- if (!(this.usesData() || Item.byId[this.id].o() || this.id > 256)) { // Should be canBeDepleted
+ if (!(this.usesData() || Item.byId[this.id].o() || this.id > 255)) { // Should be usesDurability
i = 0;
}
@@ -167,7 +167,7 @@ public final class ItemStack {
// CraftBukkit end
this.damage = i;
- if (this.damage < 0) {
+ if (this.damage < -1) { // CraftBukkit - don't filter -1, we use it
this.damage = 0;
}
}