TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-02-11 20:00:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3051 from pop4959/xp-tab-complete-fix

Browse source 
Fix tab completion for Exp command
This commit is contained in:
Joe Hirschfeld 2020-03-30 22:58:21 -07:00 committed by GitHub
commit c7d9ce7f7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Essentials/src/com/earth2me/essentials/commands/Commandexp.java
View file

@ -179,24 +179,23 @@ public class Commandexp extends EssentialsCommand {
} }
return options; return options;
} else if (args.length == 2) { } else if (args.length == 2) {
if ((args[0].equalsIgnoreCase("set") && user.isAuthorized("essentials.exp.set")) || (args[0].equalsIgnoreCase("give") && user.isAuthorized("essentials.exp.give"))) { if ((args[0].equalsIgnoreCase("set") && user.isAuthorized("essentials.exp.set")) || (args[0].equalsIgnoreCase("give") && user.isAuthorized("essentials.exp.give")) || (args[0].equalsIgnoreCase("take") && user.isAuthorized("essentials.exp.take"))) {
String levellessArg = args[1].toLowerCase(Locale.ENGLISH).replace("l", ""); String levellessArg = args[1].toLowerCase(Locale.ENGLISH).replaceAll("l", "");
if (NumberUtil.isInt(levellessArg)) { if (NumberUtil.isInt(levellessArg)) {
return Lists.newArrayList(levellessArg, args[1] + "l"); return Lists.newArrayList(levellessArg + "l");
} else {
return Collections.emptyList();
} }
} else if (args[0].equalsIgnoreCase("show") && user.isAuthorized("essentials.exp.others")) { }
if (user.isAuthorized("essentials.exp.others")) {
return getPlayers(server, user); return getPlayers(server, user);
} else {
return Collections.emptyList();
} }
} else if (args.length == 3 && (args[0].equalsIgnoreCase("set") && user.isAuthorized("essentials.exp.set.others")) || (args[0].equalsIgnoreCase("give") && user.isAuthorized("essentials.exp.give.others"))) { } else if (args.length == 3 && !(args[0].equalsIgnoreCase("show") || args[0].equalsIgnoreCase("reset"))) {
return getPlayers(server, user); String levellessArg = args[2].toLowerCase(Locale.ENGLISH).replaceAll("l", "");
} else { if (NumberUtil.isInt(levellessArg)) {
return Collections.emptyList(); return Lists.newArrayList(levellessArg + "l");
} }
} }
return Collections.emptyList();
}
@Override @Override
protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) { protected List<String> getTabCompleteOptions(final Server server, final CommandSource sender, final String commandLabel, final String[] args) {