Merge remote-tracking branch 'origin/master' into authme-process

Conflicts:
	src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java
	src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
	src/main/java/fr/xephi/authme/process/register/AsyncRegister.java
	src/main/java/fr/xephi/authme/settings/Settings.java

src/main/java/fr/xephi/authme/cache/auth/PlayerAuth.java

@@ -162,8 +162,10 @@ public class PlayerAuth {
      * @param email     String
      * @param realName  String
      */
-    public PlayerAuth(String nickname, String hash, String salt, int groupId, String ip, long lastLogin, double x, double y, double z, String world, String email, String realName) {
-        this.nickname = nickname;
+    public PlayerAuth(String nickname, String hash, String salt, int groupId, String ip,
+                      long lastLogin, double x, double y, double z, String world, String email,
+                      String realName) {
+        this.nickname = nickname.toLowerCase();
         this.hash = hash;
         this.ip = ip;
         this.lastLogin = lastLogin;
@@ -202,7 +204,7 @@ public class PlayerAuth {
      * @param nickname String
      */
     public void setName(String nickname) {
-        this.nickname = nickname;
+        this.nickname = nickname.toLowerCase();
     }
 
     /**

src/main/java/fr/xephi/authme/cache/limbo/LimboCache.java

@@ -117,10 +117,9 @@ public class LimboCache {
      * @param name String
      */
     public void deleteLimboPlayer(String name) {
-        if(cache.containsKey(name)) {
-            cache.get(name).clearTask();
-            cache.remove(name);
-        }
+    	if (name == null)
+    		return;
+        cache.remove(name);
     }
 
     /**
@@ -131,6 +130,8 @@ public class LimboCache {
      * @return LimboPlayer
      */
     public LimboPlayer getLimboPlayer(String name) {
+    	if (name == null)
+    		return null;
         return cache.get(name);
     }
 
@@ -142,6 +143,8 @@ public class LimboCache {
      * @return boolean
      */
     public boolean hasLimboPlayer(String name) {
+    	if (name == null)
+    		return false;
         return cache.containsKey(name);
     }
 
@@ -151,9 +154,8 @@ public class LimboCache {
      * @param player Player
      */
     public void updateLimboPlayer(Player player) {
-        String name = player.getName().toLowerCase();
-        if (hasLimboPlayer(name)) {
-            deleteLimboPlayer(name);
+        if (this.hasLimboPlayer(player.getName().toLowerCase())) {
+            this.deleteLimboPlayer(player.getName().toLowerCase());
         }
         addLimboPlayer(player);
     }