Fixed NPE with TagAPI and added config option for it

This commit is contained in:
kingbirdy 2014-08-01 01:34:13 -04:00
parent 97bd39c076
commit ac813496a4
2 changed files with 16 additions and 12 deletions

View file

@ -62,6 +62,8 @@ public class ConfigManager {
config.addDefault("Properties.RegionProtection.RespectFactions", true); config.addDefault("Properties.RegionProtection.RespectFactions", true);
config.addDefault("Properties.RegionProtection.RespectTowny", true); config.addDefault("Properties.RegionProtection.RespectTowny", true);
config.addDefault("Properties.RegionProtection.RespectPreciousStones", true); config.addDefault("Properties.RegionProtection.RespectPreciousStones", true);
config.addDefault("Properties.TagAPI.Enabled", true);
config.addDefault("Properties.Air.CanBendWithWeapons", false); config.addDefault("Properties.Air.CanBendWithWeapons", false);
config.addDefault("Properties.Air.Particles", "smoke"); config.addDefault("Properties.Air.Particles", "smoke");

View file

@ -18,17 +18,19 @@ public class TagAPIListener implements Listener {
@EventHandler @EventHandler
public void onNameTag(AsyncPlayerReceiveNameTagEvent e) { public void onNameTag(AsyncPlayerReceiveNameTagEvent e) {
List<Element> elements = Methods.getBendingPlayer(e.getNamedPlayer().getName()).getElements(); List<Element> elements = Methods.getBendingPlayer(e.getNamedPlayer().getName()).getElements();
if (elements.size() > 1) if (elements!=null && plugin.getConfig().getBoolean("Properties.TagAPI.Enabled")) {
e.setTag(ChatColor.LIGHT_PURPLE + e.getNamedPlayer().getName()); if (elements.size() > 1)
else if (elements.get(0).equals(Element.Earth)) e.setTag(ChatColor.LIGHT_PURPLE + e.getNamedPlayer().getName());
e.setTag(ChatColor.GREEN + e.getNamedPlayer().getName()); else if (elements.get(0).equals(Element.Earth))
else if (elements.get(0).equals(Element.Air)) e.setTag(ChatColor.GREEN + e.getNamedPlayer().getName());
e.setTag(ChatColor.GRAY + e.getNamedPlayer().getName()); else if (elements.get(0).equals(Element.Air))
else if (elements.get(0).equals(Element.Water)) e.setTag(ChatColor.GRAY + e.getNamedPlayer().getName());
e.setTag(ChatColor.AQUA + e.getNamedPlayer().getName()); else if (elements.get(0).equals(Element.Water))
else if (elements.get(0).equals(Element.Fire)) e.setTag(ChatColor.AQUA + e.getNamedPlayer().getName());
e.setTag(ChatColor.RED + e.getNamedPlayer().getName()); else if (elements.get(0).equals(Element.Fire))
else if (elements.get(0).equals(Element.Chi)) e.setTag(ChatColor.RED + e.getNamedPlayer().getName());
e.setTag(ChatColor.GOLD + e.getNamedPlayer().getName()); else if (elements.get(0).equals(Element.Chi))
e.setTag(ChatColor.GOLD + e.getNamedPlayer().getName());
}
} }
} }