From e63764e585a6f80b94b651999488d4a4931b52be Mon Sep 17 00:00:00 2001
From: Maxetto <max-8000@hotmail.it>
Date: Fri, 10 Jul 2015 16:15:12 +0200
Subject: [PATCH] Moved password checks with the others

---
 .../process/register/AsyncronousRegister.java | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/process/register/AsyncronousRegister.java b/src/main/java/fr/xephi/authme/process/register/AsyncronousRegister.java
index 0a6be53f..297957d1 100644
--- a/src/main/java/fr/xephi/authme/process/register/AsyncronousRegister.java
+++ b/src/main/java/fr/xephi/authme/process/register/AsyncronousRegister.java
@@ -52,15 +52,27 @@ public class AsyncronousRegister {
             allowRegister = false;
         }
 
-        else if ((lowpass.contains("delete") || lowpass.contains("where") || lowpass.contains("insert") || lowpass.contains("modify") || lowpass.contains("from") || lowpass.contains("select") || lowpass.contains(";") || lowpass.contains("null")) || !lowpass.matches(Settings.getPassRegex)) {
+        else if (lowpass.contains("delete") || lowpass.contains("where") || lowpass.contains("insert") || lowpass.contains("modify") || lowpass.contains("from") || lowpass.contains("select") || lowpass.contains(";") || lowpass.contains("null") || !lowpass.matches(Settings.getPassRegex)) {
             m.send(player, "password_error");
             allowRegister = false;
         }
 
-        else if ((lowpass.equalsIgnoreCase(player.getName()))) {
+        else if (lowpass.equalsIgnoreCase(player.getName())) {
             m.send(player, "password_error_nick");
             allowRegister = false;
         }
+        
+        else if (password.length() < Settings.getPasswordMinLen || password.length() > Settings.passwordMaxLength) {
+            m.send(player, "pass_len");
+            allowRegister = false;
+        }
+        
+        else if (!Settings.unsafePasswords.isEmpty()) {
+            if (Settings.unsafePasswords.contains(password.toLowerCase())) {
+                m.send(player, "password_error_unsafe");
+                allowRegister = false;
+            }
+        }
 
         else if (database.isAuthAvailable(name)) {
             m.send(player, "user_regged");
@@ -125,16 +137,6 @@ public class AsyncronousRegister {
     }
 
     protected void passwordRegister() {
-        if (password.length() < Settings.getPasswordMinLen || password.length() > Settings.passwordMaxLength) {
-            m.send(player, "pass_len");
-            return;
-        }
-        if (!Settings.unsafePasswords.isEmpty()) {
-            if (Settings.unsafePasswords.contains(password.toLowerCase())) {
-                m.send(player, "password_error_unsafe");
-                return;
-            }
-        }
         PlayerAuth auth = null;
         String hash = "";
         try {