From 2c798a9e9b193503f84e0d6dca12db9522a71ca0 Mon Sep 17 00:00:00 2001 From: Tahg Date: Sat, 5 Feb 2011 00:02:09 -0500 Subject: [PATCH] Fix for multi-stack adds --- .../org/bukkit/craftbukkit/inventory/CraftInventory.java | 2 +- .../org/bukkit/craftbukkit/inventory/CraftItemStack.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java index 7ef2054c07..06f485f3b1 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java @@ -209,7 +209,7 @@ public class CraftInventory implements org.bukkit.inventory.Inventory { } else { // More than a single stack! if (item.getAmount() > getMaxItemStack()) { - setItem( firstFree, new CraftItemStack(item.getTypeId(), getMaxItemStack())); + setItem( firstFree, new CraftItemStack(item.getTypeId(), getMaxItemStack(), item.getDamage())); item.setAmount(item.getAmount() - getMaxItemStack()); } else { // Just store it diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java index cecafa94a7..2f242af485 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java @@ -32,19 +32,19 @@ public class CraftItemStack extends ItemStack { this(type.getId(), amount); } - public CraftItemStack(final int type, final int amount, final byte damage) { + public CraftItemStack(final int type, final int amount, final short damage) { this(type, amount, damage, null); } - public CraftItemStack(final Material type, final int amount, final byte damage) { + public CraftItemStack(final Material type, final int amount, final short damage) { this(type.getId(), amount, damage); } - public CraftItemStack(final Material type, final int amount, final byte damage, final Byte data) { + public CraftItemStack(final Material type, final int amount, final short damage, final Byte data) { this(type.getId(), amount, damage, data); } - public CraftItemStack(int type, int amount, byte damage, Byte data) { + public CraftItemStack(int type, int amount, short damage, Byte data) { this(new net.minecraft.server.ItemStack(type, amount, data != null ? data : damage)); }