Merge branch 'master' into db-improve

Conflicts: src/main/java/fr/xephi/authme/AuthMe.java
2016-02-26 12:42:32 +07:00
parent 775e2f7039 1b65b285ac
commit 8324decfa1
61 changed files with 1086 additions and 510 deletions
@@ -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;