Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 306-command-service

This commit is contained in:
ljacqu
2015-12-23 18:09:21 +01:00
23 changed files with 335 additions and 295 deletions
@@ -30,7 +30,7 @@ public class RegisterCommand implements ExecutableCommand {
// Make sure the command arguments are valid
final Player player = (Player) sender;
if (arguments.isEmpty() || (Settings.getEnablePasswordVerifier && arguments.size() < 2)) {
if (arguments.isEmpty() || (Settings.enablePasswordConfirmation && arguments.size() < 2)) {
m.send(player, MessageKey.USAGE_REGISTER);
return;
}
@@ -50,7 +50,7 @@ public class RegisterCommand implements ExecutableCommand {
management.performRegister(player, thePass, email);
return;
}
if (arguments.size() > 1 && Settings.getEnablePasswordVerifier) {
if (arguments.size() > 1 && Settings.enablePasswordConfirmation) {
if (!arguments.get(0).equals(arguments.get(1))) {
m.send(player, MessageKey.PASSWORD_MATCH_ERROR);
return;