josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Machiavelli
2009-06-19 20:08:09 +02:00
parent 5cc4b07a57 48ea016135
commit 3155500096
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/BattleGroundMgr.cpp
+1 -1
View File
@@ -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++)
{
src/game/Player.cpp
+4 -2
View File
@@ -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))
{