diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/DungeonFinding/LFGMgr.cpp | 10 | ||||
| -rw-r--r-- | src/server/game/Server/Protocol/Handlers/LFGHandler.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 82d6fd430bd..54e4fa661ae 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -101,7 +101,7 @@ void LFGMgr::Cleaner() m_QueueInfoMap.erase(itQueue); } } - + // Remove from NewToQueue those guids that do not exist in queueMap for (LfgGuidList::iterator it = m_newToQueue.begin(); it != m_newToQueue.end();) { @@ -278,7 +278,7 @@ void LFGMgr::Update(uint32 diff) SendUpdateProposal(plr, m_lfgProposalId, pProposal); } } - + if (pProposal->state == LFG_PROPOSAL_SUCCESS) UpdateProposal(m_lfgProposalId, lowGuid, 1); @@ -1185,7 +1185,7 @@ void LFGMgr::UpdateProposal(uint32 proposalId, uint32 lowGuid, uint8 accept) else if (role & ROLE_DAMAGE) m_WaitTimeDps = int32((m_WaitTimeDps * m_NumWaitTimeDps + waitTime) / ++m_NumWaitTimeDps); } - + grp->SetLfgRoles(plr->GetGUID(), pProposal->players[plr->GetGUIDLow()]->role); } @@ -1251,7 +1251,7 @@ void LFGMgr::RemoveProposal(LfgProposalMap::iterator itProposal, LfgUpdateType t updateType = type; plr->GetLfgDungeons()->clear(); plr->SetLfgRoles(ROLE_NONE); - + if (itQueue != m_QueueInfoMap.end()) m_QueueInfoMap.erase(itQueue); } @@ -1656,7 +1656,7 @@ void LFGMgr::SendLfgPlayerReward(Player *plr) uint32 rdungeonId = 0; uint32 sdungeonId = 0; LFGDungeonEntry const *dungeon = sLFGDungeonStore.LookupEntry(*plr->GetLfgDungeons()->begin()); - if (dungeon) + if (dungeon) rdungeonId = dungeon->Entry(); if (plr->GetGroup()) sdungeonId = plr->GetGroup()->GetLfgDungeonEntry(false); diff --git a/src/server/game/Server/Protocol/Handlers/LFGHandler.cpp b/src/server/game/Server/Protocol/Handlers/LFGHandler.cpp index 2fd25d4609a..ce980194c56 100644 --- a/src/server/game/Server/Protocol/Handlers/LFGHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/LFGHandler.cpp @@ -64,10 +64,10 @@ void WorldSession::HandleLfgJoinOpcode(WorldPacket &recv_data) Group *grp = GetPlayer()->GetGroup(); bool isRandomDungeon = dungeons->size() == 1 && sLFGMgr.isRandomDungeon(*dungeons->begin()); bool isCurrentDungeon = newDungeons.size() == 1 && grp && grp->isLFGGroup() && grp->GetLfgDungeonEntry() == *newDungeons.begin(); - + if (!isRandomDungeon || !isCurrentDungeon) // is not offer to continue - clear old dungeons and use new dungeons { - dungeons->clear(); + dungeons->clear(); for (LfgDungeonSet::const_iterator it = newDungeons.begin(); it != newDungeons.end(); ++it) dungeons->insert(*it); } |