Meishin/LoginSystem
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ljacqu
2015-12-23 18:09:21 +01:00
parent be942c2b36 0beb937b8f
commit a9fc658db0
23 changed files with 335 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/fr/xephi/authme/command/CommandInitializer.java
+1 -1
View File
@@ -297,7 +297,7 @@ public final class CommandInitializer {
.description("Registration command")
.detailedDescription("Command to register using AuthMeReloaded.")
.withArgument("password", "Password", false)
.withArgument("verifyPassword", "Verify password", false)
.withArgument("verifyPassword", "Verify password", true)
.permissions(ALLOWED, PlayerPermission.REGISTER)
.executableCommand(new RegisterCommand())
.build();
src/main/java/fr/xephi/authme/command/executable/register/RegisterCommand.java
+2 -2
View File
@@ -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;