summaryrefslogtreecommitdiffstats
path: root/src/main/java/org
diff options
context:
space:
mode:
authorTaylor Kelly <tkelly910@gmail.com>2011-01-10 11:03:53 +0800
committerDinner Bone <dinnerbone@dinnerbone.com>2011-01-10 11:05:42 +0800
commit0a15f98a2e4a28cd6d64bae783350ae42ea5eac6 (patch)
tree4a4c49bd4c3b9bd594c92340a13ef9ec3fda4a7c /src/main/java/org
parent750cc107ae2b9b3c473e91ee651b10f6f46cb763 (diff)
downloadcraftbukkit-0a15f98a2e4a28cd6d64bae783350ae42ea5eac6.tar
craftbukkit-0a15f98a2e4a28cd6d64bae783350ae42ea5eac6.tar.gz
craftbukkit-0a15f98a2e4a28cd6d64bae783350ae42ea5eac6.tar.lz
craftbukkit-0a15f98a2e4a28cd6d64bae783350ae42ea5eac6.tar.xz
craftbukkit-0a15f98a2e4a28cd6d64bae783350ae42ea5eac6.zip
Fixed CIP
Diffstat (limited to 'src/main/java/org')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftInventoryPlayer.java21
1 files changed, 10 insertions, 11 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftInventoryPlayer.java
index b49d6d97..df36affa 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftInventoryPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftInventoryPlayer.java
@@ -15,17 +15,6 @@ public class CraftInventoryPlayer extends CraftInventory implements PlayerInvent
return (InventoryPlayer) inventory;
}
- public ArrayList<ItemStack> getArmorContents() {
- net.minecraft.server.ItemStack[] mcItems = getInventory().getArmorContents();
- ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
-
- for (int i = 0; i < mcItems.length; i++ ) {
- ret.add(new CraftItemStack(mcItems[i]));
- }
-
- return ret;
- }
-
public int getSize() {
return super.getSize() - 4;
}
@@ -65,4 +54,14 @@ public class CraftInventoryPlayer extends CraftInventory implements PlayerInvent
public void setBoots(ItemStack boots) {
setItem( getSize() + 3, boots );
}
+
+ public ItemStack[] getArmorContents() {
+ net.minecraft.server.ItemStack[] mcItems = getInventory().getArmorContents();
+ ItemStack[] ret = new ItemStack[mcItems.length];
+
+ for (int i = 0; i < mcItems.length; i++ ) {
+ ret[i] = new CraftItemStack(mcItems[i]);
+ }
+ return ret;
+ }
}