diff options
| author | Erik Broes <erikbroes@grum.nl> | 2012-01-12 23:10:13 +0100 |
|---|---|---|
| committer | Erik Broes <erikbroes@grum.nl> | 2012-01-12 23:10:13 +0100 |
| commit | 7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee (patch) | |
| tree | a1ca024b03aadf4b687f442b33bf713aecd511f7 /src/main/java/net/minecraft/server/PlayerInventory.java | |
| parent | dd5ef8725c699e0b2946dc0f6d523ca482404043 (diff) | |
| download | craftbukkit-7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee.tar craftbukkit-7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee.tar.gz craftbukkit-7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee.tar.lz craftbukkit-7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee.tar.xz craftbukkit-7219d4dd858b405f34ea66c67f8ab7d4c07fb4ee.zip | |
Updated to Minecraft 1.1
Diffstat (limited to 'src/main/java/net/minecraft/server/PlayerInventory.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/PlayerInventory.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/PlayerInventory.java b/src/main/java/net/minecraft/server/PlayerInventory.java index e0f0914a..decdc49a 100644 --- a/src/main/java/net/minecraft/server/PlayerInventory.java +++ b/src/main/java/net/minecraft/server/PlayerInventory.java @@ -43,7 +43,7 @@ public class PlayerInventory implements IInventory { private int firstPartial(ItemStack itemstack) { for (int i = 0; i < this.items.length; ++i) { - if (this.items[i] != null && this.items[i].id == itemstack.id && this.items[i].isStackable() && this.items[i].count < this.items[i].getMaxStackSize() && this.items[i].count < this.getMaxStackSize() && (!this.items[i].usesData() || this.items[i].getData() == itemstack.getData())) { + if (this.items[i] != null && this.items[i].id == itemstack.id && this.items[i].isStackable() && this.items[i].count < this.items[i].getMaxStackSize() && this.items[i].count < this.getMaxStackSize() && (!this.items[i].usesData() || this.items[i].getData() == itemstack.getData()) && ItemStack.equals(this.items[i], itemstack)) { return i; } } @@ -104,6 +104,9 @@ public class PlayerInventory implements IInventory { } else { if (this.items[k] == null) { this.items[k] = new ItemStack(i, 0, itemstack.getData()); + if (itemstack.hasTag()) { + this.items[k].setTag((NBTTagCompound) itemstack.getTag().clone()); + } } int l = j; |