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

Core/Dungeon Finder: Use correct guids to readd or remove players when removing a failed proposal

Browse Source 
- Also add Some debug and Error msgs

--HG--
branch : trunk
This commit is contained in:
Spp
2010-09-16 18:55:24 +02:00
parent c7354dd66b
commit 502a813720
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/DungeonFinding/LFGMgr.cpp
+8 -1
View File
@@ -1462,6 +1462,7 @@ void LFGMgr::UpdateProposal(uint32 proposalId, uint32 lowGuid, bool accept)
LfgProposalPlayer *ppPlayer = itProposalPlayer->second; LfgProposalPlayer *ppPlayer = itProposalPlayer->second;
ppPlayer->accept = LfgAnswer(accept); ppPlayer->accept = LfgAnswer(accept);
sLog.outDebug("LFGMgr::UpdateProposal: Player [" UI64FMTD "] of proposal %u selected: %u", MAKE_NEW_GUID(lowGuid, 0, HIGHGUID_PLAYER), proposalId, accept);
if (!accept) if (!accept)
{ {
RemoveProposal(itProposal, LFG_UPDATETYPE_PROPOSAL_DECLINED); RemoveProposal(itProposal, LFG_UPDATETYPE_PROPOSAL_DECLINED);
@@ -1615,6 +1616,7 @@ void LFGMgr::RemoveProposal(LfgProposalMap::iterator itProposal, LfgUpdateType t
LfgProposal *pProposal = itProposal->second; LfgProposal *pProposal = itProposal->second;
pProposal->state = LFG_PROPOSAL_FAILED; pProposal->state = LFG_PROPOSAL_FAILED;
sLog.outDebug("LFGMgr::RemovalProposal: Proposal %u, state FAILED, UpdateType %u", itProposal->first, type);
// Mark all people that didn't answered as no accept // Mark all people that didn't answered as no accept
if (type == LFG_UPDATETYPE_PROPOSAL_FAILED) if (type == LFG_UPDATETYPE_PROPOSAL_FAILED)
for (LfgProposalPlayerMap::const_iterator it = pProposal->players.begin(); it != pProposal->players.end(); ++it) for (LfgProposalPlayerMap::const_iterator it = pProposal->players.begin(); it != pProposal->players.end(); ++it)
@@ -1627,7 +1629,7 @@ void LFGMgr::RemoveProposal(LfgProposalMap::iterator itProposal, LfgUpdateType t
plr = sObjectMgr.GetPlayerByLowGUID(it->first); plr = sObjectMgr.GetPlayerByLowGUID(it->first);
if (!plr) if (!plr)
continue; continue;
guid = plr->GetGroup() ? plr->GetGroup()->GetGUID(): plr->GetGUID(); guid = it->second->groupLowGuid ? MAKE_NEW_GUID(it->second->groupLowGuid, 0, HIGHGUID_GROUP) : plr->GetGUID();
plr->GetSession()->SendUpdateProposal(itProposal->first, pProposal); plr->GetSession()->SendUpdateProposal(itProposal->first, pProposal);
// Remove members that didn't accept // Remove members that didn't accept
@@ -1638,6 +1640,7 @@ void LFGMgr::RemoveProposal(LfgProposalMap::iterator itProposal, LfgUpdateType t
plr->GetLfgDungeons()->clear(); plr->GetLfgDungeons()->clear();
plr->SetLfgRoles(ROLE_NONE); plr->SetLfgRoles(ROLE_NONE);
sLog.outError("LFGMgr::RemoveProposal: [" UI64FMTD "] didn't accept. Removing from queue and compatible cache", guid);
if (itQueue != m_QueueInfoMap.end()) if (itQueue != m_QueueInfoMap.end())
m_QueueInfoMap.erase(itQueue); m_QueueInfoMap.erase(itQueue);
RemoveFromCompatibles(guid); RemoveFromCompatibles(guid);
@@ -1645,9 +1648,13 @@ void LFGMgr::RemoveProposal(LfgProposalMap::iterator itProposal, LfgUpdateType t
else // Readd to queue else // Readd to queue
{ {
if (itQueue == m_QueueInfoMap.end()) // Can't readd! misssing queue info! if (itQueue == m_QueueInfoMap.end()) // Can't readd! misssing queue info!
{
sLog.outError("LFGMgr::RemoveProposal: Imposible to readd [" UI64FMTD "] to queue. Missing queue info!", guid);
updateType = LFG_UPDATETYPE_REMOVED_FROM_QUEUE; updateType = LFG_UPDATETYPE_REMOVED_FROM_QUEUE;
}
else else
{ {
sLog.outError("LFGMgr::RemoveProposal: Readding [" UI64FMTD "] to queue.", guid);
itQueue->second->joinTime = time_t(time(NULL)); itQueue->second->joinTime = time_t(time(NULL));
AddGuidToNewQueue(guid); AddGuidToNewQueue(guid);
updateType = LFG_UPDATETYPE_ADDED_TO_QUEUE; updateType = LFG_UPDATETYPE_ADDED_TO_QUEUE;