diff options
author | deathmarine <josh@mcjoshmod.com> | 2012-12-12 10:45:31 -0500 |
---|---|---|
committer | feildmaster <admin@feildmaster.com> | 2012-12-12 22:20:44 -0600 |
commit | 53b064ec79c62f34ca98dd08b0ae4cc04e51a81f (patch) | |
tree | 285ce7559c7f0c216f05c4f416a6ef68611b096e /src/main | |
parent | 24143ef6a16bc8e079c8fdc950895a954a98273e (diff) | |
download | craftbukkit-53b064ec79c62f34ca98dd08b0ae4cc04e51a81f.tar craftbukkit-53b064ec79c62f34ca98dd08b0ae4cc04e51a81f.tar.gz craftbukkit-53b064ec79c62f34ca98dd08b0ae4cc04e51a81f.tar.lz craftbukkit-53b064ec79c62f34ca98dd08b0ae4cc04e51a81f.tar.xz craftbukkit-53b064ec79c62f34ca98dd08b0ae4cc04e51a81f.zip |
Fix EntityEquipment positions being reversed. Fixes BUKKIT-3157
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java index f4066ca7..c402cf8c 100644 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java @@ -7,10 +7,10 @@ import org.bukkit.inventory.ItemStack; public class CraftEntityEquipment implements EntityEquipment { private static final int WEAPON_SLOT = 0; - private static final int HELMET_SLOT = 1; - private static final int CHEST_SLOT = 2; - private static final int LEG_SLOT = 3; - private static final int BOOT_SLOT = 4; + private static final int HELMET_SLOT = 4; + private static final int CHEST_SLOT = 3; + private static final int LEG_SLOT = 2; + private static final int BOOT_SLOT = 1; private static final int INVENTORY_SLOTS = 5; private final CraftLivingEntity entity; @@ -61,14 +61,14 @@ public class CraftEntityEquipment implements EntityEquipment { public ItemStack[] getArmorContents() { ItemStack[] armor = new ItemStack[INVENTORY_SLOTS - 1]; - for(int slot = HELMET_SLOT; slot < INVENTORY_SLOTS; slot++) { + for(int slot = WEAPON_SLOT + 1; slot < INVENTORY_SLOTS; slot++) { armor[slot - 1] = getEquipment(slot); } return armor; } public void setArmorContents(ItemStack[] items) { - for(int slot = HELMET_SLOT; slot < INVENTORY_SLOTS; slot++) { + for(int slot = WEAPON_SLOT + 1; slot < INVENTORY_SLOTS; slot++) { ItemStack equipment = items != null && slot <= items.length ? items[slot - 1] : null; setEquipment(slot, equipment); } |