diff --git a/src/dbofficial/asyncdbauth.cpp b/src/dbofficial/asyncdbauth.cpp index 91f07aea..02aee093 100644 --- a/src/dbofficial/asyncdbauth.cpp +++ b/src/dbofficial/asyncdbauth.cpp @@ -52,8 +52,8 @@ AsyncDBAuth::HandleResult(mysqlpp::Query &/*query*/, DBIdManager& /*idManager*/, service.post(boost::bind(&ServerDBCallback::PlayerLoginFailed, &cb, GetId())); } else { int blocked = result[0][2]; - //int active = result[0][5]; - if (/*(active != 1) ||*/ (blocked != 0)) { + int active = result[0][7]; + if ((active != 1) || (blocked != 0)) { service.post(boost::bind(&ServerDBCallback::PlayerLoginBlocked, &cb, GetId())); } else { mysqlpp::String secret(result[0][1]); diff --git a/src/dbofficial/serverdbthread.cpp b/src/dbofficial/serverdbthread.cpp index f18ea68d..7d6889ab 100644 --- a/src/dbofficial/serverdbthread.cpp +++ b/src/dbofficial/serverdbthread.cpp @@ -463,7 +463,7 @@ ServerDBThread::EstablishDBConnection() */ prepareNick << "PREPARE " QUERY_NICK_PREPARE " FROM " << mysqlpp::quote - << "SELECT " DB_TABLE_PLAYER_COL_ID ", AES_DECRYPT(" DB_TABLE_PLAYER_COL_PASSWORD ", ?), " DB_TABLE_PLAYER_COL_VALID ", TRIM(" DB_TABLE_PLAYER_COL_COUNTRY "), " DB_TABLE_PLAYER_COL_LASTLOGIN ", " DB_TABLE_PLAYER_COL_LASTGAMES ", " DB_TABLE_PLAYER_COL_LASTIP " FROM " DB_TABLE_PLAYER " WHERE " DB_TABLE_PLAYER_COL_USERNAME " = ?"; + << "SELECT " DB_TABLE_PLAYER_COL_ID ", AES_DECRYPT(" DB_TABLE_PLAYER_COL_PASSWORD ", ?), " DB_TABLE_PLAYER_COL_VALID ", TRIM(" DB_TABLE_PLAYER_COL_COUNTRY "), " DB_TABLE_PLAYER_COL_LASTLOGIN ", " DB_TABLE_PLAYER_COL_LASTGAMES ", " DB_TABLE_PLAYER_COL_LASTIP ", " DB_TABLE_PLAYER_COL_ACTIVE " FROM " DB_TABLE_PLAYER " WHERE " DB_TABLE_PLAYER_COL_USERNAME " = ?"; mysqlpp::Query prepareAvatarBlacklist = m_connData->conn.query(); prepareAvatarBlacklist diff --git a/src/net/common/serverlobbythread.cpp b/src/net/common/serverlobbythread.cpp index 7df6babf..0ac024dd 100644 --- a/src/net/common/serverlobbythread.cpp +++ b/src/net/common/serverlobbythread.cpp @@ -1382,7 +1382,7 @@ ServerLobbyThread::HandleNetPacketCreateGame(boost::shared_ptr sess } else if (!session->GetPlayerData()->IsPlayerAllowedToJoinCreateLimitRank() // @TODO: uncomment in productive /*&& tmpData.gameType != GAME_TYPE_RANKING*/ ) { - LOG_ERROR('not allowed due to ranklimit'); + LOG_ERROR("not allowed due to ranklimit"); SendJoinGameFailed(session, gameId, NTF_NET_JOIN_GUEST_FORBIDDEN); } else { boost::shared_ptr game(