From 5c059bdd4340bc76f3b820ac378c176f37f12506 Mon Sep 17 00:00:00 2001
From: Xephi59 <xephirot59@gmail.com>
Date: Mon, 10 Aug 2015 23:15:29 +0200
Subject: [PATCH] Move from Join to Login

---
 .../authme/listener/AuthMePlayerListener.java | 12 ++++++++++
 .../authme/process/join/AsyncronousJoin.java  | 22 -------------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index 8f2f03d1c..93b431927 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -44,6 +44,7 @@ import fr.xephi.authme.cache.auth.PlayerAuth;
 import fr.xephi.authme.cache.auth.PlayerCache;
 import fr.xephi.authme.cache.limbo.LimboCache;
 import fr.xephi.authme.cache.limbo.LimboPlayer;
+import fr.xephi.authme.datasource.DataSource;
 import fr.xephi.authme.plugin.manager.CombatTagComunicator;
 import fr.xephi.authme.settings.Messages;
 import fr.xephi.authme.settings.Settings;
@@ -465,6 +466,17 @@ public class AuthMePlayerListener implements Listener {
             return;
         }
 
+        if (plugin.database.getType() != DataSource.DataSourceType.FILE) {
+            PlayerAuth auth = plugin.database.getAuth(name);
+            if (auth.getRealName() != null && !auth.getRealName().isEmpty() && !auth.getRealName().equalsIgnoreCase("Player") && !auth.getRealName().equals(player.getName())) {
+                event.setKickMessage(m.send("same_nick")[0]);
+                event.setResult(PlayerLoginEvent.Result.KICK_OTHER);
+                if (Settings.banUnsafeIp)
+                    plugin.getServer().banIP(player.getAddress().getAddress().getHostAddress());
+                return;
+            }
+        }
+
         int min = Settings.getMinNickLength;
         int max = Settings.getMaxNickLength;
         String regex = Settings.getNickRegex;
diff --git a/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java b/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
index 94043b9c5..d1ef309d0 100644
--- a/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
+++ b/src/main/java/fr/xephi/authme/process/join/AsyncronousJoin.java
@@ -100,28 +100,6 @@ public class AsyncronousJoin {
         }
         final Location spawnLoc = plugin.getSpawnLocation(player);
         if (database.isAuthAvailable(name)) {
-            if (database.getType() != DataSource.DataSourceType.FILE) {
-                PlayerAuth auth = database.getAuth(name);
-                if (auth.getRealName() != null && !auth.getRealName().isEmpty() && !auth.getRealName().equalsIgnoreCase("Player") && !auth.getRealName().equals(player.getName())) {
-                    final GameMode gM = AuthMePlayerListener.gameMode.get(name);
-                    sched.scheduleSyncDelayedTask(plugin, new Runnable() {
-
-                        @Override
-                        public void run() {
-                            if (gM != null) {
-                                AuthMePlayerListener.causeByAuthMe.put(name, true);
-                                player.setGameMode(gM);
-                                AuthMePlayerListener.causeByAuthMe.put(name, false);
-                            }
-                            player.kickPlayer("You are not the Owner of this account, please try another name!");
-                            if (Settings.banUnsafeIp)
-                                plugin.getServer().banIP(ip);
-                        }
-
-                    }, 1);
-                    return;
-                }
-            }
             if (Settings.isForceSurvivalModeEnabled && !Settings.forceOnlyAfterLogin) {
                 sched.scheduleSyncDelayedTask(plugin, new Runnable() {