summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2011-01-09 23:40:29 +0100
committerErik Broes <erikbroes@grum.nl>2011-01-09 23:40:46 +0100
commit68f23c547ca865db0be32402ed5ff7cc141f5183 (patch)
treefd2d5b7e77c5b11762150beba9db67f52ed14cff /src/main
parenta83e58e4625b0b5117d0d6daec2bcf43714c8980 (diff)
downloadbukkit-68f23c547ca865db0be32402ed5ff7cc141f5183.tar
bukkit-68f23c547ca865db0be32402ed5ff7cc141f5183.tar.gz
bukkit-68f23c547ca865db0be32402ed5ff7cc141f5183.tar.lz
bukkit-68f23c547ca865db0be32402ed5ff7cc141f5183.tar.xz
bukkit-68f23c547ca865db0be32402ed5ff7cc141f5183.zip
Fixed getArmorContents() return value
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/bukkit/ItemStack.java5
-rw-r--r--src/main/java/org/bukkit/PlayerInventory.java4
2 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/org/bukkit/ItemStack.java b/src/main/java/org/bukkit/ItemStack.java
index e90a5fe5..b2a4c6f4 100644
--- a/src/main/java/org/bukkit/ItemStack.java
+++ b/src/main/java/org/bukkit/ItemStack.java
@@ -127,6 +127,11 @@ public class ItemStack {
}
@Override
+ public String toString() {
+ return "ItemStack{"+getType().name()+" x "+getAmount()+"}";
+ }
+
+ @Override
public boolean equals(Object object) {
return false;
}
diff --git a/src/main/java/org/bukkit/PlayerInventory.java b/src/main/java/org/bukkit/PlayerInventory.java
index 419eb07b..9dfffc6d 100644
--- a/src/main/java/org/bukkit/PlayerInventory.java
+++ b/src/main/java/org/bukkit/PlayerInventory.java
@@ -1,7 +1,5 @@
package org.bukkit;
-import java.util.ArrayList;
-
/**
* Includes interface to the 4 armor slots
*/
@@ -11,7 +9,7 @@ public interface PlayerInventory extends Inventory {
*
* @return All the ItemStacks from the armor slots
*/
- public ArrayList<ItemStack> getArmorContents();
+ public ItemStack[] getArmorContents();
/**
* Return the ItemStack from the helmet slot