Updated Inventory with proper generics, fixed ItemStack to have data as 'Byte' so we can put in nulls when not having data.

3 files changed, 8 insertions, 8 deletions

diff --git a/src/main/java/org/bukkit/inventory/Inventory.java b/src/main/java/org/bukkit/inventory/Inventory.java
index e4bc9afd..043da1cf 100644
--- a/src/main/java/org/bukkit/inventory/Inventory.java
+++ b/src/main/java/org/bukkit/inventory/Inventory.java
@@ -104,7 +104,7 @@ public interface Inventory {
      * @param materialId The materialId to look for
      * @return The Slots found.
      */
-    public HashMap<Integer,ItemStack> all(int materialId); 
+    public HashMap<Integer, ? extends ItemStack> all(int materialId); 
 
     /**
      * Find all slots in the inventory containing any ItemStacks with the given material
@@ -112,7 +112,7 @@ public interface Inventory {
      * @param materialId The material to look for
      * @return The Slots found.
      */
-    public HashMap<Integer,ItemStack> all(Material material); 
+    public HashMap<Integer, ? extends ItemStack> all(Material material); 
 
     /**
      * Find all slots in the inventory containing any ItemStacks with the given ItemStack
@@ -121,7 +121,7 @@ public interface Inventory {
      * @param item The ItemStack to match against
      * @return The Slots found.
      */
-    public HashMap<Integer,ItemStack> all(ItemStack item);
+    public HashMap<Integer, ? extends ItemStack> all(ItemStack item);
 
     /**
      * Find the first slot in the inventory containing an ItemStack with the given materialId
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 3d6df5d3..f7b509bc 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -30,21 +30,21 @@ public class ItemStack {
     }

 

     public ItemStack(final int type, final int amount, final byte damage) {

-        this(type, amount, damage, (byte) 0);

+        this(type, amount, damage, null);

     }

 

     public ItemStack(final Material type, final int amount, final byte damage) {

         this(type.getId(), amount, damage);

     }

 

-    public ItemStack(final int type, final int amount, final byte damage, final byte data) {

+    public ItemStack(final int type, final int amount, final byte damage, final Byte data) {

         this.type = type;

         this.amount = amount;

         this.damage = damage;

-        createData(data);

+        if (data != null) createData(data);

     }

 

-    public ItemStack(final Material type, final int amount, final byte damage, final byte data) {

+    public ItemStack(final Material type, final int amount, final byte damage, final Byte data) {

         this(type.getId(), amount, damage, data);

     }

 

diff --git a/src/main/java/org/bukkit/inventory/PlayerInventory.java b/src/main/java/org/bukkit/inventory/PlayerInventory.java
index 983fec4b..0e82ca0e 100644
--- a/src/main/java/org/bukkit/inventory/PlayerInventory.java
+++ b/src/main/java/org/bukkit/inventory/PlayerInventory.java
@@ -74,7 +74,7 @@ public interface PlayerInventory extends Inventory {
     /**

      * Returns the ItemStack currently hold

      * 

-     * @return The currently holded ItemStack

+     * @return The currently held ItemStack

      */

     public ItemStack getItemInHand();