diff options
| -rwxr-xr-x | src/server/game/Battlegrounds/ArenaTeam.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rwxr-xr-x | src/server/shared/Database/PreparedStatement.cpp | 56 |
3 files changed, 31 insertions, 29 deletions
diff --git a/src/server/game/Battlegrounds/ArenaTeam.cpp b/src/server/game/Battlegrounds/ArenaTeam.cpp index cb55ded6c4e..3eefccac409 100755 --- a/src/server/game/Battlegrounds/ArenaTeam.cpp +++ b/src/server/game/Battlegrounds/ArenaTeam.cpp @@ -125,7 +125,7 @@ bool ArenaTeam::AddMember(const uint64& playerGuid) } // Check if player is already in a similar arena team - if (player && player->GetArenaTeamId(GetSlot()) || Player::GetArenaTeamIdFromDB(playerGuid, GetType()) != 0) + if ((player && player->GetArenaTeamId(GetSlot())) || Player::GetArenaTeamIdFromDB(playerGuid, GetType()) != 0) { sLog->outError("Arena: Player %s (guid: %u) already has an arena team of type %u", playerName.c_str(), GUID_LOPART(playerGuid), GetType()); return false; diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 3f7e6c9c1e6..cbed7b4c8e7 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -493,6 +493,7 @@ inline void KillRewarder::_RewardXP(Player* player, float rate) { uint32 xp(_xp); if (_group) + { // 4.2.1. If player is in group, adjust XP: // * set to 0 if player's level is more than maximum level of not gray member; // * cut XP in half if _isFullXP is false. @@ -503,6 +504,7 @@ inline void KillRewarder::_RewardXP(Player* player, float rate) uint32(xp * rate / 2) + 1; // Reward only HALF of XP if some of group members are gray. else xp = 0; + } if (xp) { // 4.2.2. Apply auras modifying rewarded XP (SPELL_AURA_MOD_XP_PCT). diff --git a/src/server/shared/Database/PreparedStatement.cpp b/src/server/shared/Database/PreparedStatement.cpp index b057791ea49..343976c3ffa 100755 --- a/src/server/shared/Database/PreparedStatement.cpp +++ b/src/server/shared/Database/PreparedStatement.cpp @@ -344,34 +344,34 @@ std::string MySQLPreparedStatement::getQueryString(const char *query) switch (m_stmt->statement_data[i].type) { - case TYPE_BOOL: - replace << m_stmt->statement_data[i].data.boolean ? "1" : "0"; - break; - case TYPE_UI8: - case TYPE_UI16: - case TYPE_UI32: - replace << m_stmt->statement_data[i].data.ui32; - break; - case TYPE_I8: - case TYPE_I16: - case TYPE_I32: - replace << m_stmt->statement_data[i].data.i32; - break; - case TYPE_UI64: - replace << m_stmt->statement_data[i].data.ui64; - break; - case TYPE_I64: - replace << m_stmt->statement_data[i].data.i64; - break; - case TYPE_FLOAT: - replace << m_stmt->statement_data[i].data.f; - break; - case TYPE_DOUBLE: - replace << m_stmt->statement_data[i].data.d; - break; - case TYPE_STRING: - replace << m_stmt->statement_data[i].str; - break; + case TYPE_BOOL: + replace << (m_stmt->statement_data[i].data.boolean ? "1" : "0"); + break; + case TYPE_UI8: + case TYPE_UI16: + case TYPE_UI32: + replace << m_stmt->statement_data[i].data.ui32; + break; + case TYPE_I8: + case TYPE_I16: + case TYPE_I32: + replace << m_stmt->statement_data[i].data.i32; + break; + case TYPE_UI64: + replace << m_stmt->statement_data[i].data.ui64; + break; + case TYPE_I64: + replace << m_stmt->statement_data[i].data.i64; + break; + case TYPE_FLOAT: + replace << m_stmt->statement_data[i].data.f; + break; + case TYPE_DOUBLE: + replace << m_stmt->statement_data[i].data.d; + break; + case TYPE_STRING: + replace << m_stmt->statement_data[i].str; + break; } replace << "'"; queryString.replace(pos, 1, replace.str()); |