Merge branch 'master' into db-improve

Conflicts:
	src/main/java/fr/xephi/authme/AuthMe.java

src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java

@@ -64,15 +64,16 @@ public class AsynchronousJoin {
         final String ip = plugin.getIP(player);
 
 
-        if (Settings.isAllowRestrictedIp && !isNameRestricted(name, ip, player.getAddress().getHostName())) {
+        if (Settings.isAllowRestrictedIp && isNameRestricted(name, ip, player.getAddress().getHostName())) {
             sched.scheduleSyncDelayedTask(plugin, new Runnable() {
 
                 @Override
                 public void run() {
                     AuthMePlayerListener.causeByAuthMe.putIfAbsent(name, true);
                     player.kickPlayer(m.retrieveSingle(MessageKey.NOT_OWNER_ERROR));
-                    if (Settings.banUnsafeIp)
+                    if (Settings.banUnsafeIp) {
                         plugin.getServer().banIP(ip);
+                    }
                 }
             });
             return;

src/main/java/fr/xephi/authme/process/login/AsynchronousLogin.java

@@ -220,7 +220,7 @@ public class AsynchronousLogin {
         }
     }
 
-    public void displayOtherAccounts(PlayerAuth auth) {
+    private void displayOtherAccounts(PlayerAuth auth) {
         if (!Settings.displayOtherAccounts || auth == null) {
             return;
         }

src/main/java/fr/xephi/authme/process/login/ProcessSyncPlayerLogin.java

@@ -2,6 +2,8 @@ package fr.xephi.authme.process.login;
 
 import fr.xephi.authme.settings.NewSetting;
 import fr.xephi.authme.settings.properties.HooksSettings;
+import fr.xephi.authme.settings.properties.RegistrationSettings;
+import fr.xephi.authme.settings.properties.RestrictionSettings;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -92,7 +94,7 @@ public class ProcessSyncPlayerLogin implements Runnable {
     }
 
     private void restoreSpeedEffects() {
-        if (Settings.isRemoveSpeedEnabled) {
+        if (settings.getProperty(RestrictionSettings.REMOVE_SPEED)) {
             player.setWalkSpeed(0.2F);
             player.setFlySpeed(0.1F);
         }
@@ -173,19 +175,19 @@ public class ProcessSyncPlayerLogin implements Runnable {
         }
 
         restoreSpeedEffects();
-        if (Settings.applyBlindEffect) {
+        if (settings.getProperty(RegistrationSettings.APPLY_BLIND_EFFECT)) {
             player.removePotionEffect(PotionEffectType.BLINDNESS);
         }
 
         // The Login event now fires (as intended) after everything is processed
         Bukkit.getServer().getPluginManager().callEvent(new LoginEvent(player));
         player.saveData();
-        if (Settings.bungee) {
+        if (settings.getProperty(HooksSettings.BUNGEECORD)) {
             sendBungeeMessage();
         }
-        // Login is finish, display welcome message if we use email registration
-        if (Settings.useWelcomeMessage && Settings.emailRegistration) {
-            if (Settings.broadcastWelcomeMessage) {
+        // Login is done, display welcome message
+        if (settings.getProperty(RegistrationSettings.USE_WELCOME_MESSAGE)) {
+            if (settings.getProperty(RegistrationSettings.BROADCAST_WELCOME_MESSAGE)) {
                 for (String s : settings.getWelcomeMessage()) {
                     Bukkit.getServer().broadcastMessage(plugin.replaceAllInfo(s, player));
                 }

src/main/java/fr/xephi/authme/process/register/AsyncRegister.java

@@ -98,7 +98,7 @@ public class AsyncRegister {
     private void emailRegister() {
         if (Settings.getmaxRegPerEmail > 0
             && !plugin.getPermissionsManager().hasPermission(player, PlayerStatePermission.ALLOW_MULTIPLE_ACCOUNTS)
-            && database.getAllAuthsByEmail(email).size() >= Settings.getmaxRegPerEmail) {
+            && database.countAuthsByEmail(email) >= Settings.getmaxRegPerEmail) {
             m.send(player, MessageKey.MAX_REGISTER_EXCEEDED);
             return;
         }