1 files changed, 22 insertions, 19 deletions

diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 6fe7cbd4a..3bc17d1a9 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -1790,31 +1790,34 @@ void cClientHandle::HandleKeepAlive(int a_KeepAliveID)
 
 bool cClientHandle::CheckMultiLogin(const AString & a_Username)
 {
-	if (!(cRoot::Get()->GetServer()->IsAllowMultiLogin()))
+	// If the multilogin is allowed, skip this check entirely:
+	if ((cRoot::Get()->GetServer()->IsAllowMultiLogin()))
 	{
-		if (cRoot::Get()->GetServer()->IsPlayerInQueue(a_Username))
-		{
-				Kick("A player of the username is already logged in");
-				return false;
-		}
-	
-		class cCallback :
-		public cPlayerListCallback
-		{
-			virtual bool Item(cPlayer * a_Player) override
-			{
-				return true;
-			}
-		} Callback;	
+		return true;
+	}
 	
-		if (cRoot::Get()->DoWithPlayer(a_Username, Callback))
-		{
+	// Check if the player is waiting to be transferred to the World.
+	if (cRoot::Get()->GetServer()->IsPlayerInQueue(a_Username))
+	{
 			Kick("A player of the username is already logged in");
 			return false;
+	}
+
+	class cCallback :
+		public cPlayerListCallback
+	{
+		virtual bool Item(cPlayer * a_Player) override
+		{
+			return true;
 		}
+	} Callback;	
+
+	// Check if the player is in any World.
+	if (cRoot::Get()->DoWithPlayer(a_Username, Callback))
+	{
+		Kick("A player of the username is already logged in");
+		return false;
 	}
-	
-	return true;
 }