summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNathan Adams <dinnerbone@dinnerbone.com>2011-12-12 21:49:35 +0000
committerNathan Adams <dinnerbone@dinnerbone.com>2011-12-12 21:49:35 +0000
commite1586e017aa8082a9fe404825c012ace889ff026 (patch)
tree11e1ef61caeb3b07e013106594aaa5dfd2a73e99 /src
parent5412d6f5a8d7e63b14a977b15f8da1c823cad351 (diff)
downloadcraftbukkit-e1586e017aa8082a9fe404825c012ace889ff026.tar
craftbukkit-e1586e017aa8082a9fe404825c012ace889ff026.tar.gz
craftbukkit-e1586e017aa8082a9fe404825c012ace889ff026.tar.lz
craftbukkit-e1586e017aa8082a9fe404825c012ace889ff026.tar.xz
craftbukkit-e1586e017aa8082a9fe404825c012ace889ff026.zip
... Fixed dispensers again!
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/ItemStack.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
index 79e431af..fe59b988 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
+++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -43,7 +43,7 @@ public final class ItemStack {
public ItemStack(int id, int count, int data, NBTTagList enchantments) {
this(id, count, data);
// taken from .addEnchantment
- if (Item.byId[this.id].getMaxStackSize() == 1) {
+ if (enchantments != null && Item.byId[this.id].getMaxStackSize() == 1) {
if (this.tag == null) {
this.setTag(new NBTTagCompound());
}