From 5e58b10919cac3b605be0af9f9b857c4789834c1 Mon Sep 17 00:00:00 2001 From: MistPhizzle Date: Fri, 27 Jun 2014 15:28:50 -0400 Subject: [PATCH] Don't break the plugin if TagAPI isn't installed --- .../projectkorra/ProjectKorra/PKListener.java | 17 +--------- .../ProjectKorra/ProjectKorra.java | 1 + .../ProjectKorra/TagAPIListener.java | 32 +++++++++++++++++++ src/plugin.yml | 4 +-- 4 files changed, 36 insertions(+), 18 deletions(-) create mode 100644 src/com/projectkorra/ProjectKorra/TagAPIListener.java diff --git a/src/com/projectkorra/ProjectKorra/PKListener.java b/src/com/projectkorra/ProjectKorra/PKListener.java index 6a404829..b7a3c222 100644 --- a/src/com/projectkorra/ProjectKorra/PKListener.java +++ b/src/com/projectkorra/ProjectKorra/PKListener.java @@ -49,7 +49,6 @@ import org.bukkit.event.player.PlayerToggleSneakEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffectType; import org.bukkit.util.Vector; -import org.kitteh.tag.AsyncPlayerReceiveNameTagEvent; import com.projectkorra.ProjectKorra.Ability.AvatarState; import com.projectkorra.ProjectKorra.airbending.AirBlast; @@ -932,19 +931,5 @@ public class PKListener implements Listener { } - 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()); - } + } diff --git a/src/com/projectkorra/ProjectKorra/ProjectKorra.java b/src/com/projectkorra/ProjectKorra/ProjectKorra.java index cc91e83a..6bdcdcb1 100644 --- a/src/com/projectkorra/ProjectKorra/ProjectKorra.java +++ b/src/com/projectkorra/ProjectKorra/ProjectKorra.java @@ -39,6 +39,7 @@ public class ProjectKorra extends JavaPlugin { Methods.createBendingPlayer(player.getUniqueId(), player.getName()); } getServer().getPluginManager().registerEvents(new PKListener(this), this); + getServer().getPluginManager().registerEvents(new TagAPIListener(this), this); getServer().getScheduler().runTaskTimerAsynchronously(this, new RevertChecker(this), 0, 200); try { diff --git a/src/com/projectkorra/ProjectKorra/TagAPIListener.java b/src/com/projectkorra/ProjectKorra/TagAPIListener.java new file mode 100644 index 00000000..25180d4f --- /dev/null +++ b/src/com/projectkorra/ProjectKorra/TagAPIListener.java @@ -0,0 +1,32 @@ +package com.projectkorra.ProjectKorra; + +import java.util.List; + +import org.bukkit.ChatColor; +import org.bukkit.event.Listener; +import org.kitteh.tag.AsyncPlayerReceiveNameTagEvent; + +public class TagAPIListener implements Listener { + + ProjectKorra plugin; + + public TagAPIListener(ProjectKorra plugin) { + this.plugin = plugin; + } + + 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()); + } +} diff --git a/src/plugin.yml b/src/plugin.yml index 00500f84..d9e5d937 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -14,11 +14,11 @@ permissions: bending.player: true bending.command.reload: true bending.command.version: true - bending.admin.permaremove: + bending.admin.permaremove: true bending.command.add.others: true bending.command.add: true bending.command.rechoose: true - bending.admin.choose: + bending.admin.choose: true bending.ability.AvatarState: true bending.ability.Bloodbending: true bending.player: