Merge fixes

world/login_server.cpp

@@ -360,20 +360,4 @@ void LoginServer::SendAccountUpdate(ServerPacket* pack) {
 		strn0cpy(s->worldpassword, LoginPassword.c_str(), 30);
 		SendPacket(pack);
 	}
-}
-
-bool LoginServer::Connected()
-{
-	if (IsLegacy) {
-		if (legacy_client) {
-			return legacy_client->Connected();
-		}
-	}
-	else {
-		if (client) {
-			return client->Connected();
-		}
-	}
-
-	return false;
-}
+}