TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-14 12:57:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #318 from Simplicitee/master

Browse source 
Change /bending who, Fix Auto Tab problem
This commit is contained in:
OmniCypher 2015-11-30 23:28:07 -08:00
commit b8ac24d869
2 changed files with 41 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/com/projectkorra/projectkorra/command/BendingTabComplete.java
View file

@ -109,12 +109,12 @@ public class BendingTabComplete implements TabCompleter {
}
List<String> abils = new ArrayList<String>();
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());
}
}

61
src/com/projectkorra/projectkorra/command/WhoCommand.java
View file

@ -76,34 +76,51 @@ public class WhoCommand extends PKCommand {
List<String> players = new ArrayList<String>();
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.");