diff options
| author | Tahg <tahgtahv@gmail.com> | 2011-02-08 19:37:53 -0500 |
|---|---|---|
| committer | Tahg <tahgtahv@gmail.com> | 2011-02-08 19:47:08 -0500 |
| commit | 61b79e8f981eac4a32a6ba022bc7378912c03762 (patch) | |
| tree | 0d776e5803efec09757511ce9e3e0fba93f4d464 /src/main/java/org | |
| parent | b76bc9cfb3613ebdafe20055e4e3e87368ae20ad (diff) | |
| download | craftbukkit-61b79e8f981eac4a32a6ba022bc7378912c03762.tar craftbukkit-61b79e8f981eac4a32a6ba022bc7378912c03762.tar.gz craftbukkit-61b79e8f981eac4a32a6ba022bc7378912c03762.tar.lz craftbukkit-61b79e8f981eac4a32a6ba022bc7378912c03762.tar.xz craftbukkit-61b79e8f981eac4a32a6ba022bc7378912c03762.zip | |
inventory fixes
Diffstat (limited to 'src/main/java/org')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java index 264d6284..a723e148 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java @@ -179,7 +179,14 @@ public class CraftInventory implements org.bukkit.inventory.Inventory { } public int firstPartial(ItemStack item) { - return firstPartial(item.getTypeId()); + CraftItemStack[] inventory = getContents(); + for (int i = 0; i < inventory.length; i++) { + CraftItemStack cItem = inventory[i]; + if (item != null && cItem.getTypeId() == item.getTypeId() && cItem.getAmount() < cItem.getMaxStackSize() && cItem.getDurability() == item.getDurability()) { + return i; + } + } + return -1; } public HashMap<Integer, ItemStack> addItem(ItemStack... items) { @@ -195,7 +202,7 @@ public class CraftInventory implements org.bukkit.inventory.Inventory { ItemStack item = items[i]; while (true) { // Do we already have a stack of it? - int firstPartial = firstPartial( item.getTypeId() ); + int firstPartial = firstPartial(item); // Drat! no partial stack if (firstPartial == -1) { |