From bd1065daa12a47ba9d47793b0cd95f95f94563e4 Mon Sep 17 00:00:00 2001 From: Benford Date: Tue, 1 Dec 2015 00:12:28 -0500 Subject: [PATCH 1/2] Change /bending who list - /bending who list now shows appropriate elements and staff title --- .../projectkorra/command/WhoCommand.java | 61 ++++++++++++------- 1 file changed, 39 insertions(+), 22 deletions(-) diff --git a/src/com/projectkorra/projectkorra/command/WhoCommand.java b/src/com/projectkorra/projectkorra/command/WhoCommand.java index b4eab80b..f234f685 100644 --- a/src/com/projectkorra/projectkorra/command/WhoCommand.java +++ b/src/com/projectkorra/projectkorra/command/WhoCommand.java @@ -76,34 +76,51 @@ public class WhoCommand extends PKCommand { List players = new ArrayList(); for (Player player : Bukkit.getOnlinePlayers()) { String playerName = player.getName(); - + String result = ""; BendingPlayer bp = GeneralMethods.getBendingPlayer(playerName); if (bp == null) { GeneralMethods.createBendingPlayer(player.getUniqueId(), player.getName()); bp = GeneralMethods.getBendingPlayer(player.getName()); } - if (bp.getElements().size() > 1) { - players.add(GeneralMethods.getAvatarColor() + playerName); - continue; - } else if (bp.getElements().size() == 0) { - players.add(playerName); - continue; - } else if (GeneralMethods.isBender(playerName, Element.Air)) { - players.add(AirMethods.getAirColor() + playerName); - continue; - } else if (GeneralMethods.isBender(playerName, Element.Water)) { - players.add(WaterMethods.getWaterColor() + playerName); - continue; - } else if (GeneralMethods.isBender(playerName, Element.Earth)) { - players.add(EarthMethods.getEarthColor() + playerName); - continue; - } else if (GeneralMethods.isBender(playerName, Element.Chi)) { - players.add(ChiMethods.getChiColor() + playerName); - continue; - } else if (GeneralMethods.isBender(playerName, Element.Fire)) { - players.add(FireMethods.getFireColor() + playerName); - continue; + if (bp.hasElement(Element.Air)) { + result = ChatColor.WHITE + playerName + " - " + AirMethods.getAirColor() + "A"; } + if (bp.hasElement(Element.Earth)) { + if (result == "") { + result = ChatColor.WHITE + playerName + " - " + EarthMethods.getEarthColor() + "E"; + } else { + result = result + ChatColor.WHITE + " | " + EarthMethods.getEarthColor() + "E"; + } + } + if (bp.hasElement(Element.Fire)) { + if (result == "") { + result = ChatColor.WHITE + playerName + " - " + FireMethods.getFireColor() + "F"; + } else { + result = result + ChatColor.WHITE + " | " + FireMethods.getFireColor() + "F"; + } + } + if (bp.hasElement(Element.Water)) { + if (result == "") { + result = ChatColor.WHITE + playerName + " - " + WaterMethods.getWaterColor() + "W"; + } else { + result = result + ChatColor.WHITE + " | " + WaterMethods.getWaterColor() + "W"; + } + } + if (bp.hasElement(Element.Chi)) { + if (result == "") { + result = ChatColor.WHITE + playerName + " - " + ChiMethods.getChiColor() + "C"; + } else { + result = result + ChatColor.WHITE + " | " + ChiMethods.getChiColor() + "C"; + } + } + if (staff.containsKey(player.getUniqueId().toString())) { + if (result == "") { + result = ChatColor.WHITE + playerName + staff.get(player.getUniqueId().toString()); + } else { + result = result + ChatColor.WHITE + " | " + staff.get(player.getUniqueId().toString()); + } + } + players.add(result); } if (players.isEmpty()) { sender.sendMessage(ChatColor.RED + "There is no one online."); From 2ec5849e734099d324d1d5e9434da636980cb49a Mon Sep 17 00:00:00 2001 From: Benford Date: Tue, 1 Dec 2015 00:18:14 -0500 Subject: [PATCH 2/2] Auto Tab fix - Changed two instances of canBend to canBind --- .../projectkorra/projectkorra/command/BendingTabComplete.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/projectkorra/projectkorra/command/BendingTabComplete.java b/src/com/projectkorra/projectkorra/command/BendingTabComplete.java index 329f28d0..5a129cef 100644 --- a/src/com/projectkorra/projectkorra/command/BendingTabComplete.java +++ b/src/com/projectkorra/projectkorra/command/BendingTabComplete.java @@ -109,12 +109,12 @@ public class BendingTabComplete implements TabCompleter { } List abils = new ArrayList(); for (String abil : AbilityModuleManager.abilities) { - if (GeneralMethods.canBend(sender.getName(), abil)) { + if (GeneralMethods.canBind(sender.getName(), abil)) { abils.add(abil); } } for (ComboAbilityModule abil : ComboModuleManager.combo) { - if (GeneralMethods.canBend(sender.getName(), abil.getName())) { + if (GeneralMethods.canBind(sender.getName(), abil.getName())) { abils.add(abil.getName()); } }