Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add "team-color" attribute to Armor Kits #856

Merged
merged 6 commits into from
May 19, 2021
Merged

Add "team-color" attribute to Armor Kits #856

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8369716
added "team-color" attribute for armor kits
destial Apr 23, 2021
9c87bf3
made "team-color" attribute override "color" attribute
destial Apr 23, 2021
b0e6627
removed redundant check
destial Apr 23, 2021
f300825
made teamColor final
destial Apr 23, 2021
18ce9c1
using requested changes
destial Apr 23, 2021
29d2fe4
modifying cloned itemstack instead
destial Apr 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion core/src/main/java/tc/oc/pgm/kits/ArmorKit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,19 @@
import java.util.Map;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.LeatherArmorMeta;
import tc.oc.pgm.api.player.MatchPlayer;

public class ArmorKit extends AbstractKit {
public static class ArmorItem {
public final ItemStack stack;
public final boolean locked;
public final boolean teamColor;

public ArmorItem(ItemStack stack, boolean locked) {
public ArmorItem(ItemStack stack, boolean locked, boolean teamColor) {
this.stack = stack;
this.locked = locked;
this.teamColor = teamColor;
}
}

Expand All @@ -39,6 +42,12 @@ public void applyPostEvent(MatchPlayer player, boolean force, List<ItemStack> di
if (force || wearing[slot] == null || wearing[slot].getType() == Material.AIR) {
wearing[slot] = entry.getValue().stack.clone();

if (entry.getValue().teamColor) {
LeatherArmorMeta meta = (LeatherArmorMeta) wearing[slot].getItemMeta();
meta.setColor(player.getParty().getFullColor());
wearing[slot].setItemMeta(meta);
}

KitMatchModule kitMatchModule = player.getMatch().getModule(KitMatchModule.class);
if (kitMatchModule != null) {
kitMatchModule.lockArmorSlot(player, entry.getKey(), entry.getValue().locked);
Expand Down
6 changes: 5 additions & 1 deletion core/src/main/java/tc/oc/pgm/kits/KitParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,11 @@ private ArmorKit.ArmorItem parseArmorItem(Element el) throws InvalidXMLException
}
ItemStack stack = parseItem(el, true);
boolean locked = XMLUtils.parseBoolean(el.getAttribute("locked"), false);
return new ArmorKit.ArmorItem(stack, locked);

boolean teamColor =
stack.getItemMeta() instanceof LeatherArmorMeta
&& XMLUtils.parseBoolean(el.getAttribute("team-color"), false);
return new ArmorKit.ArmorItem(stack, locked, teamColor);
}

public ArmorKit parseArmorKit(Element el) throws InvalidXMLException {
Expand Down