Upstream
/
war
mirror of https://github.com/taoneill/war.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed colored armor not working at all in loadouts

This commit is contained in:
cmastudios 2013-01-25 19:17:20 -06:00
parent c87799c03d
commit c3d7b74109
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
war/src/main/java/com/tommytony/war/War.java
View File

@ -338,6 +338,7 @@ public class War extends JavaPlugin {
public ItemStack copyStack(ItemStack originalStack) {
ItemStack copiedStack = new ItemStack(originalStack.getType(), originalStack.getAmount(), originalStack.getDurability(), new Byte(originalStack.getData().getData()));
copiedStack.setDurability(originalStack.getDurability());
copiedStack.setItemMeta(originalStack.getItemMeta());
copyEnchantments(originalStack, copiedStack);
return copiedStack;

19
war/src/main/java/com/tommytony/war/mapper/LoadoutYmlMapper.java
View File

@ -10,6 +10,11 @@ import org.bukkit.enchantments.Enchantment;
import org.bukkit.inventory.ItemStack;
import com.tommytony.war.War;
import java.util.Arrays;
import java.util.logging.Level;
import org.bukkit.Bukkit;
import org.bukkit.Color;
import org.bukkit.inventory.meta.LeatherArmorMeta;
public class LoadoutYmlMapper {
@ -27,7 +32,6 @@ public class LoadoutYmlMapper {
List<Integer> slots = config.getIntegerList(loadoutName + ".slots");
for (Integer slot : slots) {
String prefix = loadoutName + "." + slot + ".";
int id = config.getInt(prefix + "id");
byte data = (byte)config.getInt(prefix + "data");
int amount = config.getInt(prefix + "amount");
@ -47,6 +51,13 @@ public class LoadoutYmlMapper {
}
}
}
if (config.contains(prefix + "armorcolor")) {
int rgb = config.getInt(prefix + "armorcolor");
Color clr = Color.fromRGB(rgb);
LeatherArmorMeta meta = (LeatherArmorMeta) stack.getItemMeta();
meta.setColor(clr);
stack.setItemMeta(meta);
}
loadout.put(slot, stack);
}
@ -108,6 +119,12 @@ public class LoadoutYmlMapper {
}
slotSection.set("enchantments", enchantmentStringList);
}
if (stack.hasItemMeta() && stack.getItemMeta() instanceof LeatherArmorMeta
&& ((LeatherArmorMeta)stack.getItemMeta()).getColor() != null) {
LeatherArmorMeta meta = (LeatherArmorMeta)stack.getItemMeta();
int rgb = meta.getColor().asRGB();
slotSection.set("armorcolor", rgb);
}
}
}
}