Merge branch 'master' of https://github.com/AuthMe-Team/AuthMeReloaded into 358-encryptn-mthd-refactor

src/main/java/fr/xephi/authme/process/email/AsyncChangeEmail.java

@@ -80,8 +80,6 @@ public class AsyncChangeEmail {
                     return;
                 }
                 m.send(player, MessageKey.EMAIL_CHANGED_SUCCESS);
-                // TODO ljacqu 20151124: Did I really miss "email_defined" or is it not present in the 'en' messages?
-                // player.sendMessage(Arrays.toString(m.send("email_defined")) + auth.getEmail());
             } else {
                 if (plugin.database.isAuthAvailable(playerName)) {
                     m.send(player, MessageKey.LOGIN_MESSAGE);

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

@@ -58,7 +58,7 @@ public class AsynchronousJoin {
         }
 
         final String ip = plugin.getIP(player);
-        if (Settings.isAllowRestrictedIp && !Settings.getRestrictedIp(name, ip)) {
+        if (Settings.isAllowRestrictedIp && !Settings.getRestrictedIp(name, ip, player.getAddress().getHostName())) {
             sched.scheduleSyncDelayedTask(plugin, new Runnable() {
 
                 @Override