Merge branch 'master' into spigot

This commit is contained in:
sekwah 2018-01-23 18:37:17 +00:00
commit cace833e75
2 changed files with 6 additions and 6 deletions

View File

@ -8,10 +8,10 @@ public class CoreListeners {
public void playerJoin(PlayerContainer player) {
if(player.isOp()) {
if(!Lang.translate("translatedata.lastchange").equals(AdvancedPortalsCore.lastTranslationUpdate)) {
player.sendMessage(Lang.translateColor("messageprefix.negative"
+ Lang.translateInsertVariablesColor("translatedata.translationsoutdated", AdvancedPortalsCore.getTranslationName())));
player.sendMessage(Lang.translateColor("messageprefix.negative"
+ Lang.translateColor("translatedata.replacecommand")));
player.sendMessage(Lang.translateColor("messageprefix.negative")
+ Lang.translateInsertVariablesColor("translatedata.translationsoutdated", AdvancedPortalsCore.getTranslationName()));
player.sendMessage(Lang.translateColor("messageprefix.negative")
+ Lang.translateColor("translatedata.replacecommand"));
}
}
}

View File

@ -53,7 +53,7 @@ public class CommandWithSubCommands implements CommandTemplate {
}
}
catch(NumberFormatException e) {
sender.sendMessage(Lang.translateInsertVariablesColor("command.help.invalidnum", args[1]));
sender.sendMessage(Lang.translateColor("messageprefix.negative") + Lang.translateInsertVariablesColor("command.help.invalidnum", args[1]));
return;
}
}
@ -96,7 +96,7 @@ public class CommandWithSubCommands implements CommandTemplate {
@Override
public List<String> onTabComplete(CommandSenderContainer sender, String[] args) {
if(args.length > 0) {
if(args.length > 1) {
for (String subCommandName : this.subCommandRegistry.getSubCommands()) {
if (subCommandName.equalsIgnoreCase(args[0])) {
SubCommand subCommand = this.getSubCommand(subCommandName);