From 39c35fd342c799325e39529c54a044fc21fecfa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Vis=C3=A9e?= <timvisee@gmail.com>
Date: Sun, 1 Nov 2015 22:06:50 +0100
Subject: [PATCH] Fixed invalid command references

---
 .../fr/xephi/authme/command/CommandManager.java  | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/command/CommandManager.java b/src/main/java/fr/xephi/authme/command/CommandManager.java
index ea84e4f00..3ce26e962 100644
--- a/src/main/java/fr/xephi/authme/command/CommandManager.java
+++ b/src/main/java/fr/xephi/authme/command/CommandManager.java
@@ -2,8 +2,11 @@ package fr.xephi.authme.command;
 
 import fr.xephi.authme.command.executable.*;
 import fr.xephi.authme.command.executable.authme.*;
+import fr.xephi.authme.command.executable.authme.ChangePasswordCommand;
+import fr.xephi.authme.command.executable.authme.RegisterCommand;
+import fr.xephi.authme.command.executable.authme.UnregisterCommand;
 import fr.xephi.authme.command.executable.captcha.CaptchaCommand;
-import fr.xephi.authme.command.executable.changepassword.ChangePasswordCommand;
+import fr.xephi.authme.command.executable.changepassword.*;
 import fr.xephi.authme.command.executable.converter.ConverterCommand;
 import fr.xephi.authme.command.executable.email.AddEmailCommand;
 import fr.xephi.authme.command.executable.email.ChangeEmailCommand;
@@ -105,7 +108,7 @@ public class CommandManager {
 
         // Register the changepassword command
         CommandDescription changePasswordCommand = new CommandDescription(
-                new RegisterCommand(),
+                new ChangePasswordCommand(),
                 new ArrayList<String>() {{
                     add("password");
                     add("changepassword");
@@ -390,7 +393,7 @@ public class CommandManager {
 
         // Register the base register command
         CommandDescription registerBaseCommand = new CommandDescription(
-                new RegisterCommand(),
+                new fr.xephi.authme.command.executable.register.RegisterCommand(),
                 new ArrayList<String>() {{
                     add("register");
                     add("reg");
@@ -420,7 +423,7 @@ public class CommandManager {
 
         // Register the base unregister command
         CommandDescription unregisterBaseCommand = new CommandDescription(
-                new UnregisterCommand(),
+                new fr.xephi.authme.command.executable.unregister.UnregisterCommand(),
                 new ArrayList<String>() {{
                     add("unregister");
                     add("unreg");
@@ -429,7 +432,6 @@ public class CommandManager {
                 "Command to unregister using AuthMeReloaded.", null);
         unregisterBaseCommand.setCommandPermissions("authme.unregister", CommandPermissions.DefaultPermission.ALLOWED);
         unregisterBaseCommand.addArgument(new CommandArgumentDescription("password", "Password", false));
-        unregisterBaseCommand.setMaximumArguments(false);
 
         // Register the help command
         CommandDescription unregisterHelpCommand = new CommandDescription(
@@ -449,7 +451,7 @@ public class CommandManager {
 
         // Register the base changepassword command
         CommandDescription changePasswordBaseCommand = new CommandDescription(
-                new ChangePasswordCommand(),
+                new fr.xephi.authme.command.executable.changepassword.ChangePasswordCommand(),
                 new ArrayList<String>() {{
                     add("changepassword");
                     add("changepass");
@@ -581,8 +583,8 @@ public class CommandManager {
         CommandDescription converterBaseCommand = new CommandDescription(
                 new ConverterCommand(),
                 new ArrayList<String>() {{
-                    add("convert");
                     add("converter");
+                    add("convert");
                     add("conv");
                 }},
                 "Convert command",