diff options
| author | Machiavelli <none@none> | 2009-06-19 20:08:09 +0200 |
|---|---|---|
| committer | Machiavelli <none@none> | 2009-06-19 20:08:09 +0200 |
| commit | 3155500096ba4473deeef75148718aa1ae268bf7 (patch) | |
| tree | e138fd7b127f3999d1a50394dd6903f7679c0476 | |
| parent | 5cc4b07a5756e1f55d44927c466299cf4ef20d1b (diff) | |
| parent | 48ea016135ca1b8a75ac6b286f4e196a46644d47 (diff) | |
Merge
--HG--
branch : trunk
| -rw-r--r-- | src/game/BattleGroundMgr.cpp | 2 | ||||
| -rw-r--r-- | src/game/Player.cpp | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp index 6639db4e040..1ed34fe01d2 100644 --- a/src/game/BattleGroundMgr.cpp +++ b/src/game/BattleGroundMgr.cpp @@ -586,7 +586,7 @@ bool BattleGroundQueue::CheckPremadeMatch(BGQueueIdBasedOnLevel queue_id, uint32 m_SelectionPools[BG_TEAM_ALLIANCE].AddGroup((*ali_group), MaxPlayersPerTeam); m_SelectionPools[BG_TEAM_HORDE].AddGroup((*horde_group), MaxPlayersPerTeam); //add groups/players from normal queue to size of bigger group - uint32 maxPlayers = std::max(m_SelectionPools[BG_TEAM_ALLIANCE].GetPlayerCount(), m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount()); + uint32 maxPlayers = std::min(m_SelectionPools[BG_TEAM_ALLIANCE].GetPlayerCount(), m_SelectionPools[BG_TEAM_HORDE].GetPlayerCount()); GroupsQueueType::const_iterator itr; for(uint32 i = 0; i < BG_TEAMS_COUNT; i++) { diff --git a/src/game/Player.cpp b/src/game/Player.cpp index 117def75164..288f2730605 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -16694,10 +16694,12 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent) pet = GetPet(); if(pet) + { sLog.outDebug("RemovePet %u, %u, %u", pet->GetEntry(), mode, returnreagent); - if(pet->m_removed) - return; + if(pet->m_removed) + return; + } if(returnreagent && (pet || m_temporaryUnsummonedPetNumber)) { |