From 78cd77ef713e9073f2a46c5c2a3fea90db470158 Mon Sep 17 00:00:00 2001
From: Erik Broes <erikbroes@grum.nl>
Date: Sun, 16 Jan 2011 16:09:59 +0100
Subject: Implement removeItem(ItemStack...)

---
 .../craftbukkit/inventory/CraftInventory.java      | 41 ++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 mode change 100755 => 100644 src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java

(limited to 'src/main/java/org')

diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
old mode 100755
new mode 100644
index 6773ea35..fd24050a
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
@@ -218,6 +218,47 @@ public class CraftInventory implements org.bukkit.inventory.Inventory {
         return leftover;
     }
 
+    public HashMap<Integer, ItemStack> removeItem(ItemStack... items) {
+        HashMap<Integer,ItemStack> leftover = new HashMap<Integer,ItemStack>();
+
+        // TODO: optimization
+
+        for (int i = 0; i < items.length; i++) {
+            ItemStack item = items[i];
+            int toDelete = item.getAmount();
+
+            while (true) {
+                int first = first(item.getType());
+
+                // Drat! we don't have this type in the inventory
+                if (first == -1) {
+                    item.setAmount( toDelete );
+                    leftover.put(i, item);
+                } else {
+                    ItemStack itemStack = getItem(first);
+                    int amount = itemStack.getAmount();
+
+                    if (amount <= toDelete) {
+                        toDelete -= amount;
+                        // clear the slot, all used up
+                        clear( i );
+                    } else {
+                        // split the stack and store
+                        itemStack.setAmount( amount - toDelete );
+                        setItem( i, itemStack );
+                        toDelete = 0;
+                    }
+                }
+
+                // Bail when done
+                if (toDelete <= 0) {
+                    break;
+                }
+            }
+        }
+        return leftover;
+    }
+
     private int getMaxItemStack() {
         return getInventory().c();
     }
-- 
cgit v1.2.3