OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-02 13:07:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix EntityEquipment positions being reversed. Fixes BUKKIT-3157

Browse source
This commit is contained in:
deathmarine 2012-12-12 10:45:31 -05:00 committed by feildmaster
parent 24143ef6a1
commit 53b064ec79
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/org/bukkit/craftbukkit/inventory/CraftEntityEquipment.java
View file

@ -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);
}