Dev - 3.1.2-DEV-3

Developpement status actually Some Fixes for the 1.7.2 Remove some Magic Values Fix threads not start correctly Add a recall email adding message Fix catpcha messages Add multilines messages ( add &n ) Fix some inventory problem Fix some events problem Call login event after /register
2014-01-06 17:54:50 +01:00
parent aaeceae5d2
commit 93a320c8ae
29 changed files with 420 additions and 254 deletions
@@ -106,13 +106,13 @@ public class PlayerAuth {
    }

    public String getHash() {
-        if(salt != null && !salt.isEmpty() && Settings.getPasswordHash == HashAlgorithm.MD5VB) {
-        	vBhash = "$MD5vb$"+salt+"$"+hash;
-            return vBhash;
-        }
-        else {
-        	return hash;
-        } 
+    	if (Settings.getPasswordHash == HashAlgorithm.MD5VB) {
+            if(salt != null && !salt.isEmpty() && Settings.getPasswordHash == HashAlgorithm.MD5VB) {
+            	vBhash = "$MD5vb$"+salt+"$"+hash;
+                return vBhash;
+            }
+    	}
+        return hash;
    }

    public String getSalt() {