From ac813496a45f21305418f23bf02a2fb21112b940 Mon Sep 17 00:00:00 2001 From: kingbirdy Date: Fri, 1 Aug 2014 01:34:13 -0400 Subject: [PATCH] Fixed NPE with TagAPI and added config option for it --- .../ProjectKorra/ConfigManager.java | 2 ++ .../ProjectKorra/TagAPIListener.java | 26 ++++++++++--------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/com/projectkorra/ProjectKorra/ConfigManager.java b/src/com/projectkorra/ProjectKorra/ConfigManager.java index 29a2a842..4d7eae21 100644 --- a/src/com/projectkorra/ProjectKorra/ConfigManager.java +++ b/src/com/projectkorra/ProjectKorra/ConfigManager.java @@ -62,6 +62,8 @@ public class ConfigManager { config.addDefault("Properties.RegionProtection.RespectFactions", true); config.addDefault("Properties.RegionProtection.RespectTowny", true); config.addDefault("Properties.RegionProtection.RespectPreciousStones", true); + + config.addDefault("Properties.TagAPI.Enabled", true); config.addDefault("Properties.Air.CanBendWithWeapons", false); config.addDefault("Properties.Air.Particles", "smoke"); diff --git a/src/com/projectkorra/ProjectKorra/TagAPIListener.java b/src/com/projectkorra/ProjectKorra/TagAPIListener.java index 19ee5ba3..ed00bb77 100644 --- a/src/com/projectkorra/ProjectKorra/TagAPIListener.java +++ b/src/com/projectkorra/ProjectKorra/TagAPIListener.java @@ -18,17 +18,19 @@ public class TagAPIListener implements Listener { @EventHandler public void onNameTag(AsyncPlayerReceiveNameTagEvent e) { List elements = Methods.getBendingPlayer(e.getNamedPlayer().getName()).getElements(); - if (elements.size() > 1) - e.setTag(ChatColor.LIGHT_PURPLE + e.getNamedPlayer().getName()); - else if (elements.get(0).equals(Element.Earth)) - e.setTag(ChatColor.GREEN + e.getNamedPlayer().getName()); - else if (elements.get(0).equals(Element.Air)) - e.setTag(ChatColor.GRAY + e.getNamedPlayer().getName()); - else if (elements.get(0).equals(Element.Water)) - e.setTag(ChatColor.AQUA + e.getNamedPlayer().getName()); - else if (elements.get(0).equals(Element.Fire)) - e.setTag(ChatColor.RED + e.getNamedPlayer().getName()); - else if (elements.get(0).equals(Element.Chi)) - e.setTag(ChatColor.GOLD + e.getNamedPlayer().getName()); + if (elements!=null && plugin.getConfig().getBoolean("Properties.TagAPI.Enabled")) { + if (elements.size() > 1) + e.setTag(ChatColor.LIGHT_PURPLE + e.getNamedPlayer().getName()); + else if (elements.get(0).equals(Element.Earth)) + e.setTag(ChatColor.GREEN + e.getNamedPlayer().getName()); + else if (elements.get(0).equals(Element.Air)) + e.setTag(ChatColor.GRAY + e.getNamedPlayer().getName()); + else if (elements.get(0).equals(Element.Water)) + e.setTag(ChatColor.AQUA + e.getNamedPlayer().getName()); + else if (elements.get(0).equals(Element.Fire)) + e.setTag(ChatColor.RED + e.getNamedPlayer().getName()); + else if (elements.get(0).equals(Element.Chi)) + e.setTag(ChatColor.GOLD + e.getNamedPlayer().getName()); + } } }