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

Core/Dungeon Finder: Multiple changes in Join function

Browse Source 
- Reformat some code to make it easier to read
- Safe leave and rejoin queue when already queued and trying to rejoin to different dungeons (it was giving error earlier)
- Do not allow to select another dungeon while im the middle of a Lfg dungeon not completed (any dungeon selected is changed by current dungeon)
- Fix error that prevented groups to join another dungeon after completing the current lfg dungeon
Core/Dungeon Finder: Remove references to player from SendLfgUpdateParty and SendLfgUpdatePlayer handlers

--HG--
branch : trunk
This commit is contained in:
Spp
2010-11-26 04:43:07 +01:00
parent 46d39f17b4
commit bbe955c5ab
4 changed files with 249 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/DungeonFinding/LFGMgr.cpp
+208 -210
View File
@@ -367,9 +367,9 @@ void LFGMgr::Update(uint32 diff)
if (Player* plr = sObjectMgr.GetPlayerByLowGUID(itPlayers->first)) if (Player* plr = sObjectMgr.GetPlayerByLowGUID(itPlayers->first))
{ {
if (plr->GetGroup()) if (plr->GetGroup())
plr->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_PROPOSAL_BEGIN); plr->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_PROPOSAL_BEGIN, plr->GetLfgDungeons(), plr->GetLfgComment());
else else
plr->GetSession()->SendLfgUpdatePlayer(LFG_UPDATETYPE_PROPOSAL_BEGIN); plr->GetSession()->SendLfgUpdatePlayer(LFG_UPDATETYPE_PROPOSAL_BEGIN, plr->GetLfgDungeons(), plr->GetLfgComment());
plr->GetSession()->SendUpdateProposal(m_lfgProposalId, pProposal); plr->GetSession()->SendUpdateProposal(m_lfgProposalId, pProposal);
} }
} }
@@ -492,200 +492,239 @@ bool LFGMgr::RemoveFromQueue(uint64 guid)
return ret; return ret;
} }
/// <summary>
/// Adds the player/group to lfg queue /// Adds the player/group to lfg queue
/// </summary> void LFGMgr::Join(Player* plr, uint8 roles, LfgDungeonSet* dungeons, std::string comment)
/// <param name="Player*">Player</param>
void LFGMgr::Join(Player* plr)
{ {
LfgDungeonSet* dungeons = NULL; if (!plr || !plr->GetSession() || !dungeons || !dungeons->size())
return;
Group* grp = plr->GetGroup(); Group* grp = plr->GetGroup();
uint64 guid = plr->GetGUID();
if (grp && grp->GetLeaderGUID() != plr->GetGUID()) uint64 gguid = grp ? grp->GetGUID() : guid;
return;
uint64 guid = grp ? grp->GetGUID() : plr->GetGUID();
LfgJoinResult result = LFG_JOIN_OK; LfgJoinResult result = LFG_JOIN_OK;
bool isDungeon = false; PlayerSet players;
bool isRaid = false; uint32 rDungeonId = 0;
LfgLockStatusMap* playersLockMap = NULL; bool isContinue = grp && grp->isLFGGroup() && !grp->isLfgDungeonComplete();
// Previous checks before joining
LfgQueueInfoMap::iterator itQueue = m_QueueInfoMap.find(guid); // Do not allow to change dungeon in the middle of a current dungeon
if (isContinue)
{
dungeons->clear();
dungeons->insert(grp->GetLfgDungeonEntry());
}
// Already in queue?
LfgQueueInfoMap::iterator itQueue = m_QueueInfoMap.find(gguid);
if (itQueue != m_QueueInfoMap.end()) if (itQueue != m_QueueInfoMap.end())
{ {
time_t now = time_t(time(NULL)); bool sameDungeons = true;
time_t joinTime = itQueue->second->joinTime; for (LfgDungeonSet::const_iterator it = plr->GetLfgDungeons()->begin(); it != plr->GetLfgDungeons()->end() && sameDungeons; ++it)
uint32 diff = uint32(now - joinTime); if (dungeons->find(*it) == dungeons->end())
sLog.outError("LFGMgr::Join: [" UI64FMTD "] trying to join but is already in queue! diff %u (" UI64FMTD " - " UI64FMTD ")", guid, diff, uint64(now), uint64(joinTime)); sameDungeons = false;
Leave(plr, grp);
result = LFG_JOIN_INTERNAL_ERROR; if (sameDungeons) // Joining the same dungeons -- Send OK
{
plr->GetSession()->SendLfgJoinResult(LFG_JOIN_OK);
for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
if (itr->getSource() && itr->getSource()->GetSession())
itr->getSource()->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_ADDED_TO_QUEUE, dungeons, comment);
dungeons->clear();
delete dungeons;
return;
}
else if (!isContinue) // Different dungeons and it's not an offer to continue
{
// Different dungeons and it's not a LfgGroup in the middle of a dungeon that need more people
Leave(plr, grp);
Join(plr, roles, dungeons, comment);
return;
}
} }
else if (plr->InBattleground() || plr->InArena() || plr->InBattlegroundQueue())
// Check player or group member restrictions
if (plr->InBattleground() || plr->InArena() || plr->InBattlegroundQueue())
result = LFG_JOIN_USING_BG_SYSTEM; result = LFG_JOIN_USING_BG_SYSTEM;
else if (plr->HasAura(LFG_SPELL_DUNGEON_DESERTER)) else if (plr->HasAura(LFG_SPELL_DUNGEON_DESERTER))
result = LFG_JOIN_DESERTER; result = LFG_JOIN_DESERTER;
else if (plr->HasAura(LFG_SPELL_DUNGEON_COOLDOWN)) else if (plr->HasAura(LFG_SPELL_DUNGEON_COOLDOWN))
result = LFG_JOIN_RANDOM_COOLDOWN; result = LFG_JOIN_RANDOM_COOLDOWN;
else else if (!dungeons || !dungeons->size())
result = LFG_JOIN_NOT_MEET_REQS;
else if (grp)
{ {
dungeons = plr->GetLfgDungeons(); if (grp->GetMembersCount() > MAXGROUPSIZE)
if (!dungeons || !dungeons->size()) result = LFG_JOIN_TOO_MUCH_MEMBERS;
result = LFG_JOIN_NOT_MEET_REQS;
else // Check if all dungeons are valid
{
LfgType type = LFG_TYPE_NONE;
for (LfgDungeonSet::const_iterator it = dungeons->begin(); it != dungeons->end() && result == LFG_JOIN_OK; ++it)
{
type = GetDungeonType(*it);
switch(type)
{
case LFG_TYPE_RANDOM:
case LFG_TYPE_DUNGEON:
case LFG_TYPE_HEROIC:
if (isRaid)
result = LFG_JOIN_MIXED_RAID_DUNGEON;
isDungeon = true;
break;
case LFG_TYPE_RAID:
if (isDungeon)
result = LFG_JOIN_MIXED_RAID_DUNGEON;
isRaid = true;
break;
default:
result = LFG_JOIN_DUNGEON_INVALID;
break;
}
}
}
dungeons = NULL;
}
if (result == LFG_JOIN_OK)
{
if (grp)
{
if (grp->GetMembersCount() > MAXGROUPSIZE)
result = LFG_JOIN_TOO_MUCH_MEMBERS;
else
{
Player* plrg;
uint8 memberCount = 0;
for (GroupReference* itr = grp->GetFirstMember(); itr != NULL && result == LFG_JOIN_OK; itr = itr->next())
{
plrg = itr->getSource();
if (plrg)
{
if (plrg->HasAura(LFG_SPELL_DUNGEON_DESERTER))
result = LFG_JOIN_PARTY_DESERTER;
else if (plrg->HasAura(LFG_SPELL_DUNGEON_COOLDOWN))
result = LFG_JOIN_PARTY_RANDOM_COOLDOWN;
else if (plrg->InBattleground() || plrg->InArena() || plrg->InBattlegroundQueue())
result = LFG_JOIN_USING_BG_SYSTEM;
++memberCount;
}
}
if (memberCount != grp->GetMembersCount())
result = LFG_JOIN_DISCONNECTED;
}
}
else else
{ {
// Expand random dungeons and check restrictions Player* plrg;
PlayerSet players; uint8 memberCount = 0;
players.insert(plr); for (GroupReference* itr = grp->GetFirstMember(); itr != NULL && result == LFG_JOIN_OK; itr = itr->next())
if (plr->GetLfgDungeons()->size() == 1 && isRandomDungeon(*plr->GetLfgDungeons()->begin()))
dungeons = GetDungeonsByRandom(*plr->GetLfgDungeons()->begin());
else
{ {
dungeons = new LfgDungeonSet(); plrg = itr->getSource();
for (LfgDungeonSet::const_iterator it = plr->GetLfgDungeons()->begin(); it != plr->GetLfgDungeons()->end(); ++it) if (plrg)
dungeons->insert(*it); {
if (plrg->HasAura(LFG_SPELL_DUNGEON_DESERTER))
result = LFG_JOIN_PARTY_DESERTER;
else if (plrg->HasAura(LFG_SPELL_DUNGEON_COOLDOWN))
result = LFG_JOIN_PARTY_RANDOM_COOLDOWN;
else if (plrg->InBattleground() || plrg->InArena() || plrg->InBattlegroundQueue())
result = LFG_JOIN_USING_BG_SYSTEM;
++memberCount;
players.insert(plrg);
}
} }
playersLockMap = CheckCompatibleDungeons(dungeons, &players); if (memberCount != grp->GetMembersCount())
if (!dungeons || !dungeons->size()) result = LFG_JOIN_DISCONNECTED;
result = LFG_JOIN_NOT_MEET_REQS;
} }
} }
else
players.insert(plr);
if (result != LFG_JOIN_OK) // Someone can't join. Clear all stuf // Check if all dungeons are valid
bool isRaid = false;
if (result == LFG_JOIN_OK)
{ {
sLog.outDebug("LFGMgr::Join: [" UI64FMTD "] joining with %u members. result: %u", guid, grp ? grp->GetMembersCount() : 1, result); bool isDungeon = false;
plr->GetLfgDungeons()->clear(); for (LfgDungeonSet::const_iterator it = dungeons->begin(); it != dungeons->end() && result == LFG_JOIN_OK; ++it)
plr->SetLfgRoles(ROLE_NONE);
if (grp && !grp->isLFGGroup())
plr->SetLfgState(LFG_STATE_NONE);
plr->GetSession()->SendLfgJoinResult(result, 0, playersLockMap);
if (playersLockMap)
{ {
for(LfgLockStatusMap::iterator it = playersLockMap->begin(); it != playersLockMap->end(); ++it) switch(GetDungeonType(*it))
{ {
it->second->clear(); case LFG_TYPE_RANDOM:
delete it->second; if (dungeons->size() > 1) // Only allow 1 random dungeon
result = LFG_JOIN_DUNGEON_INVALID;
else
rDungeonId = (*dungeons->begin());
// No break on purpose (Random can only be dungeon or heroic dungeon)
case LFG_TYPE_HEROIC:
case LFG_TYPE_DUNGEON:
if (isRaid)
result = LFG_JOIN_MIXED_RAID_DUNGEON;
isDungeon = true;
break;
case LFG_TYPE_RAID:
if (isDungeon)
result = LFG_JOIN_MIXED_RAID_DUNGEON;
isRaid = true;
break;
default:
result = LFG_JOIN_DUNGEON_INVALID;
break;
} }
playersLockMap->clear();
delete playersLockMap;
} }
if (dungeons)
// Expand random dungeons and check restrictions
if (rDungeonId)
{ {
dungeons->clear(); dungeons->clear();
delete dungeons; delete dungeons;
dungeons = GetDungeonsByRandom(rDungeonId);
} }
CheckCompatibleDungeons(dungeons, &players, false);
if (!dungeons || !dungeons->size())
result = LFG_JOIN_NOT_MEET_REQS;
}
// Can't join. Send result
if (result != LFG_JOIN_OK)
{
sLog.outDebug("LFGMgr::Join: [" UI64FMTD "] joining with %u members. result: %u", guid, grp ? grp->GetMembersCount() : 1, result);
plr->GetSession()->SendLfgJoinResult(result);
if (dungeons)
dungeons->clear();
delete dungeons;
dungeons = NULL;
return; return;
} }
if (!isRaid) // At the moment do not allow to join Raid Browser // FIXME - Raid browser not supported yet
{ if (isRaid)
if (grp)
{
Player* plrg = NULL;
for (GroupReference* itr = plr->GetGroup()->GetFirstMember(); itr != NULL; itr = itr->next())
{
plrg = itr->getSource(); // Not null, checked earlier
plrg->SetLfgState(LFG_STATE_LFG);
if (plrg != plr)
{
dungeons = plrg->GetLfgDungeons();
dungeons->clear();
for (LfgDungeonSet::const_iterator itDungeon = plr->GetLfgDungeons()->begin(); itDungeon != plr->GetLfgDungeons()->end(); ++itDungeon)
dungeons->insert(*itDungeon);
}
plrg->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_JOIN_PROPOSAL);
}
UpdateRoleCheck(grp, plr);
std::string dungeonsstr = ConcatenateDungeons(dungeons);
sLog.outDebug("LFGMgr::Join: [" UI64FMTD "] joined with %u members. dungeons: %s", guid, grp ? grp->GetMembersCount() : 1, dungeonsstr.c_str());
dungeons = NULL;
}
else
{
plr->GetSession()->SendLfgJoinResult(LFG_JOIN_OK, 0);
plr->GetSession()->SendLfgUpdatePlayer(LFG_UPDATETYPE_JOIN_PROPOSAL);
plr->SetLfgState(LFG_STATE_LFG);
LfgQueueInfo* pqInfo = new LfgQueueInfo();
pqInfo->joinTime = time_t(time(NULL));
pqInfo->roles[plr->GetGUIDLow()] = plr->GetLfgRoles();
uint8 roles = plr->GetLfgRoles();
if (roles & ROLE_TANK)
--pqInfo->tanks;
else if (roles & ROLE_HEALER)
--pqInfo->healers;
else
--pqInfo->dps;
for (LfgDungeonSet::const_iterator it = dungeons->begin(); it != dungeons->end(); ++it)
pqInfo->dungeons.insert(*it);
m_QueueInfoMap[guid] = pqInfo;
AddGuidToNewQueue(guid);
std::string dungeonsstr = ConcatenateDungeons(dungeons);
sLog.outDebug("LFGMgr::Join: [" UI64FMTD "] joined with %u members. dungeons: %s", guid, grp ? grp->GetMembersCount() : 1, dungeonsstr.c_str());
}
}
if (dungeons)
{ {
sLog.outDebug("LFGMgr::Join: [" UI64FMTD "] trying to join raid browser and it's disabled.", guid);
dungeons->clear(); dungeons->clear();
delete dungeons; delete dungeons;
dungeons = NULL;
return;
} }
// All ok, Update player info
if (!isContinue)
{
plr->GetLfgDungeons()->clear();
if (rDungeonId)
plr->GetLfgDungeons()->insert(rDungeonId);
else
for (LfgDungeonSet::const_iterator it = dungeons->begin(); it != dungeons->end(); ++it)
plr->GetLfgDungeons()->insert(*it);
}
plr->SetLfgComment(comment);
plr->SetLfgRoles(roles);
if (grp) // Begin rolecheck
{
LfgRoleCheck* pRoleCheck = new LfgRoleCheck();
pRoleCheck->cancelTime = time_t(time(NULL)) + LFG_TIME_ROLECHECK;
pRoleCheck->result = LFG_ROLECHECK_INITIALITING;
pRoleCheck->leader = plr->GetGUIDLow();
m_RoleChecks[grp->GetLowGUID()] = pRoleCheck;
if (isContinue)
{
dungeons->clear();
dungeons->insert(grp->GetLfgDungeonEntry());
}
else if (rDungeonId)
{
dungeons->clear();
dungeons->insert(rDungeonId);
}
for (LfgDungeonSet::const_iterator it = dungeons->begin(); it != dungeons->end(); ++it)
pRoleCheck->dungeons.insert(*it);
Player* plrg;
for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
{
plrg = itr->getSource();
if (!plrg)
continue;
plrg->GetSession()->SendLfgUpdateParty(LFG_UPDATETYPE_JOIN_PROPOSAL, dungeons, comment);
plrg->SetLfgState(LFG_STATE_LFG);
if (!isContinue)
{
plrg->GetLfgDungeons()->clear();
for (LfgDungeonSet::const_iterator it = dungeons->begin(); it != dungeons->end(); ++it)
plrg->GetLfgDungeons()->insert(*it);
}
pRoleCheck->roles[plrg->GetGUIDLow()] = 0;
}
UpdateRoleCheck(grp, plr, true);
}
else // Add player to queue
{
plr->GetSession()->SendLfgJoinResult(LFG_JOIN_OK);
plr->GetSession()->SendLfgUpdatePlayer(LFG_UPDATETYPE_JOIN_PROPOSAL, dungeons, comment);
plr->SetLfgState(LFG_STATE_LFG);
LfgQueueInfo* pqInfo = new LfgQueueInfo();
pqInfo->joinTime = time_t(time(NULL));
pqInfo->roles[plr->GetGUIDLow()] = plr->GetLfgRoles();
uint8 roles = plr->GetLfgRoles();
if (roles & ROLE_TANK)
--pqInfo->tanks;
else if (roles & ROLE_HEALER)
--pqInfo->healers;
else
--pqInfo->dps;
for (LfgDungeonSet::const_iterator it = dungeons->begin(); it != dungeons->end(); ++it)
pqInfo->dungeons.insert(*it);
m_QueueInfoMap[guid] = pqInfo;
AddGuidToNewQueue(guid);
}
std::string dungeonsstr = ConcatenateDungeons(dungeons);
sLog.outDebug("LFGMgr::Join: [" UI64FMTD "] joined with %u members. dungeons: %s", guid, grp ? grp->GetMembersCount() : 1, dungeonsstr.c_str());
dungeons->clear();
delete dungeons;
dungeons = NULL;
} }
/// <summary> /// <summary>
@@ -1073,46 +1112,19 @@ bool LFGMgr::CheckCompatibility(LfgGuidList check, LfgProposal*& pProposal)
return true; return true;
} }
/// <summary>
/// Update the Role check info with the player selected role. /// Update the Role check info with the player selected role.
/// </summary> void LFGMgr::UpdateRoleCheck(Group* grp, Player* plr /* = NULL*/, bool newRoleCheck /* = false */)
/// <param name="Group*">Group</param>
/// <param name="Player*">Player (optional, default NULL)</param>
void LFGMgr::UpdateRoleCheck(Group* grp, Player* plr /* = NULL*/)
{ {
if (!grp) if (!grp)
return; return;
uint32 rolecheckId = grp->GetLowGUID();
LfgRoleCheck* pRoleCheck = NULL; LfgRoleCheck* pRoleCheck = NULL;
LfgRolesMap check_roles; LfgRolesMap check_roles;
LfgRoleCheckMap::iterator itRoleCheck = m_RoleChecks.find(rolecheckId); LfgRoleCheckMap::iterator itRoleCheck = m_RoleChecks.find(grp->GetLowGUID());
bool newRoleCheck = itRoleCheck == m_RoleChecks.end(); if (itRoleCheck == m_RoleChecks.end())
if (newRoleCheck) return;
{
if (!plr || grp->GetLeaderGUID() != plr->GetGUID())
return;
LfgDungeonSet* dungeons = plr->GetLfgDungeons();
pRoleCheck = new LfgRoleCheck();
pRoleCheck->cancelTime = time_t(time(NULL)) + LFG_TIME_ROLECHECK;
pRoleCheck->result = LFG_ROLECHECK_INITIALITING;
pRoleCheck->leader = plr->GetGUIDLow();
for (GroupReference* itr = grp->GetFirstMember(); itr != NULL; itr = itr->next())
if (Player* plrg = itr->getSource())
pRoleCheck->roles[plrg->GetGUIDLow()] = 0;
// Check if it's offer continue or trying to find a new instance after a random assigned (Join Random + LfgGroup)
if (grp->isLFGGroup() && dungeons->size() == 1 && isRandomDungeon(*dungeons->begin()) && grp->GetLfgDungeonEntry())
pRoleCheck->dungeons.insert(grp->GetLfgDungeonEntry());
else
for (LfgDungeonSet::const_iterator itDungeon = dungeons->begin(); itDungeon != dungeons->end(); ++itDungeon)
pRoleCheck->dungeons.insert(*itDungeon);
}
else
pRoleCheck = itRoleCheck->second;
pRoleCheck = itRoleCheck->second;
LfgLockStatusMap* playersLockMap = NULL; LfgLockStatusMap* playersLockMap = NULL;
if (plr) if (plr)
{ {
@@ -1201,7 +1213,7 @@ void LFGMgr::UpdateRoleCheck(Group* grp, Player* plr /* = NULL*/)
continue; continue;
case LFG_ROLECHECK_FINISHED: case LFG_ROLECHECK_FINISHED:
if (!playersLockMap) if (!playersLockMap)
session->SendLfgUpdateParty(LFG_UPDATETYPE_ADDED_TO_QUEUE); session->SendLfgUpdateParty(LFG_UPDATETYPE_ADDED_TO_QUEUE, &pRoleCheck->dungeons, plrg->GetLfgComment());
else else
{ {
if (grp->GetLeaderGUID() == plrg->GetGUID()) if (grp->GetLeaderGUID() == plrg->GetGUID())
@@ -1254,11 +1266,8 @@ void LFGMgr::UpdateRoleCheck(Group* grp, Player* plr /* = NULL*/)
pRoleCheck->dungeons.clear(); pRoleCheck->dungeons.clear();
pRoleCheck->roles.clear(); pRoleCheck->roles.clear();
delete pRoleCheck; delete pRoleCheck;
if (!newRoleCheck) m_RoleChecks.erase(itRoleCheck);
m_RoleChecks.erase(itRoleCheck);
} }
else if (newRoleCheck)
m_RoleChecks[rolecheckId] = pRoleCheck;
} }
/// <summary> /// <summary>
@@ -1688,9 +1697,9 @@ void LFGMgr::RemoveProposal(LfgProposalMap::iterator itProposal, LfgUpdateType t
} }
if (plr->GetGroup()) if (plr->GetGroup())
plr->GetSession()->SendLfgUpdateParty(updateType); plr->GetSession()->SendLfgUpdateParty(updateType, plr->GetLfgDungeons(), plr->GetLfgComment());
else else
plr->GetSession()->SendLfgUpdatePlayer(updateType); plr->GetSession()->SendLfgUpdatePlayer(updateType, plr->GetLfgDungeons(), plr->GetLfgComment());
} }
@@ -2241,17 +2250,6 @@ bool LFGMgr::isRandomDungeon(uint32 dungeonId)
return dungeon->type == LFG_TYPE_RANDOM; return dungeon->type == LFG_TYPE_RANDOM;
} }
/// <summary>
/// Given a guid returns if it recently joined queue
/// </summary>
/// <param name="uint64&">guid</param>
/// <returns>bool</returns>
bool LFGMgr::isJoining(uint64 guid)
{
LfgQueueInfoMap::iterator itQueue = m_QueueInfoMap.find(guid);
return itQueue != m_QueueInfoMap.end() && itQueue->second->joinTime + LFG_TIME_JOIN_WARNING > time_t(time(NULL));
}
/// <summary> /// <summary>
/// Given a Achievement id returns the related dungeon id /// Given a Achievement id returns the related dungeon id
/// </summary> /// </summary>
src/server/game/DungeonFinding/LFGMgr.h
+2 -5
View File
@@ -30,7 +30,6 @@ enum LFGenum
LFG_TIME_ROLECHECK = 2*MINUTE, LFG_TIME_ROLECHECK = 2*MINUTE,
LFG_TIME_BOOT = 2*MINUTE, LFG_TIME_BOOT = 2*MINUTE,
LFG_TIME_PROPOSAL = 2*MINUTE, LFG_TIME_PROPOSAL = 2*MINUTE,
LFG_TIME_JOIN_WARNING = 1*IN_MILLISECONDS,
LFG_TANKS_NEEDED = 1, LFG_TANKS_NEEDED = 1,
LFG_HEALERS_NEEDED = 1, LFG_HEALERS_NEEDED = 1,
LFG_DPS_NEEDED = 3, LFG_DPS_NEEDED = 3,
@@ -248,13 +247,13 @@ class LFGMgr
LFGMgr(); LFGMgr();
~LFGMgr(); ~LFGMgr();
void Join(Player* plr); void Join(Player* plr, uint8 roles, LfgDungeonSet* dungeons, std::string comment);
void Leave(Player* plr, Group* grp = NULL); void Leave(Player* plr, Group* grp = NULL);
void OfferContinue(Group* grp); void OfferContinue(Group* grp);
void TeleportPlayer(Player* plr, bool out, bool fromOpcode = false); void TeleportPlayer(Player* plr, bool out, bool fromOpcode = false);
void UpdateProposal(uint32 proposalId, uint32 lowGuid, bool accept); void UpdateProposal(uint32 proposalId, uint32 lowGuid, bool accept);
void UpdateBoot(Player* plr, bool accept); void UpdateBoot(Player* plr, bool accept);
void UpdateRoleCheck(Group* grp, Player* plr = NULL); void UpdateRoleCheck(Group* grp, Player* plr = NULL, bool newRoleCheck = false);
void Update(uint32 diff); void Update(uint32 diff);
bool isRandomDungeon(uint32 dungeonId); bool isRandomDungeon(uint32 dungeonId);
@@ -270,8 +269,6 @@ class LFGMgr
LfgLockStatusSet* GetPlayerLockStatusDungeons(Player* plr, LfgDungeonSet* dungeons = NULL, bool useEntry = true); LfgLockStatusSet* GetPlayerLockStatusDungeons(Player* plr, LfgDungeonSet* dungeons = NULL, bool useEntry = true);
LfgReward const* GetRandomDungeonReward(uint32 dungeon, uint8 level); LfgReward const* GetRandomDungeonReward(uint32 dungeon, uint8 level);
bool isJoining(uint64 guid);
private: private:
void Cleaner(); void Cleaner();
void AddGuidToNewQueue(uint64 guid); void AddGuidToNewQueue(uint64 guid);
src/server/game/Server/Protocol/Handlers/LFGHandler.cpp
+36 -74
View File
@@ -59,17 +59,10 @@ void BuildPartyLockDungeonBlock(WorldPacket &data, LfgLockStatusMap* lockMap)
void WorldSession::HandleLfgJoinOpcode(WorldPacket &recv_data) void WorldSession::HandleLfgJoinOpcode(WorldPacket &recv_data)
{ {
if (!sWorld.getBoolConfig(CONFIG_DUNGEON_FINDER_ENABLE)) if (!sWorld.getBoolConfig(CONFIG_DUNGEON_FINDER_ENABLE) ||
(GetPlayer()->GetGroup() && GetPlayer()->GetGroup()->GetLeaderGUID() != GetPlayer()->GetGUID()))
{ {
recv_data.rpos(recv_data.wpos()); recv_data.rpos(recv_data.wpos());
sLog.outDebug("CMSG_LFG_JOIN [" UI64FMTD "] Dungeon finder disabled", GetPlayer()->GetGUID());
return;
}
if (sLFGMgr.isJoining(GetPlayer()->GetGUID()))
{
recv_data.rpos(recv_data.wpos());
sLog.outDebug("CMSG_LFG_JOIN [" UI64FMTD "] already Joining. Ignoring", GetPlayer()->GetGUID());
return; return;
} }
@@ -77,11 +70,10 @@ void WorldSession::HandleLfgJoinOpcode(WorldPacket &recv_data)
uint32 dungeon; uint32 dungeon;
uint32 roles; uint32 roles;
std::string comment; std::string comment;
LfgDungeonSet newDungeons; LfgDungeonSet* newDungeons;
recv_data >> roles; recv_data >> roles;
recv_data.read_skip<uint8>(); // unk - always 0 recv_data.read_skip<uint16>(); // uint8 (always 0) - uint8 (always 0)
recv_data.read_skip<uint8>(); // unk - always 0
recv_data >> numDungeons; recv_data >> numDungeons;
if (!numDungeons) if (!numDungeons)
{ {
@@ -90,34 +82,18 @@ void WorldSession::HandleLfgJoinOpcode(WorldPacket &recv_data)
return; return;
} }
newDungeons = new LfgDungeonSet();
for (int8 i = 0 ; i < numDungeons; ++i) for (int8 i = 0 ; i < numDungeons; ++i)
{ {
recv_data >> dungeon; recv_data >> dungeon;
newDungeons.insert((dungeon & 0x00FFFFFF)); // remove the type from the dungeon entry newDungeons->insert((dungeon & 0x00FFFFFF)); // remove the type from the dungeon entry
} }
recv_data >> numDungeons; // unk - always 3 recv_data.read_skip<uint32>(); // for 0..uint8 (always 3) { uint8 (always 0) }
for (int8 i = 0 ; i < numDungeons; ++i)
recv_data.read_skip<uint8>(); // unk - always 0
recv_data >> comment; recv_data >> comment;
sLog.outDebug("CMSG_LFG_JOIN [" UI64FMTD "] roles: %u, Dungeons: %u, Comment: %s", GetPlayer()->GetGUID(), roles, uint8(newDungeons->size()), comment.c_str());
LfgDungeonSet* dungeons = GetPlayer()->GetLfgDungeons(); sLFGMgr.Join(GetPlayer(), uint8(roles), newDungeons, comment);
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();
for (LfgDungeonSet::const_iterator it = newDungeons.begin(); it != newDungeons.end(); ++it)
dungeons->insert(*it);
}
GetPlayer()->SetLfgRoles(uint8(roles));
GetPlayer()->SetLfgComment(comment);
sLog.outDebug("CMSG_LFG_JOIN [" UI64FMTD "] as group: %u - Dungeons: %u", GetPlayer()->GetGUID(), grp ? 1 : 0, uint8(newDungeons.size()));
newDungeons.clear();
sLFGMgr.Join(GetPlayer());
} }
void WorldSession::HandleLfgLeaveOpcode(WorldPacket & /*recv_data*/) void WorldSession::HandleLfgLeaveOpcode(WorldPacket & /*recv_data*/)
@@ -300,14 +276,8 @@ void WorldSession::HandleLfrLeaveOpcode(WorldPacket &recv_data)
//sLFGMgr.LeaveLfr(GetPlayer(), dungeonId); //sLFGMgr.LeaveLfr(GetPlayer(), dungeonId);
} }
void WorldSession::SendLfgUpdatePlayer(uint8 updateType) void WorldSession::SendLfgUpdatePlayer(uint8 updateType, LfgDungeonSet* dungeons /* = NULL */, std::string comment /* = "" */)
{ {
if (!GetPlayer()->GetLfgUpdate())
{
sLog.outDebug("SMSG_LFG_UPDATE_PLAYER [" UI64FMTD "] updatetype: %u not sent! player flag: false", GetPlayer()->GetGUID(), updateType);
return;
}
bool queued = false; bool queued = false;
bool extrainfo = false; bool extrainfo = false;
@@ -323,37 +293,31 @@ void WorldSession::SendLfgUpdatePlayer(uint8 updateType)
extrainfo = true; extrainfo = true;
break; break;
} }
LfgDungeonSet* dungeons = GetPlayer()->GetLfgDungeons();
uint8 size = dungeons->size();
std::string comment = GetPlayer()->GetLfgComment();
sLog.outDebug("SMSG_LFG_UPDATE_PLAYER [" UI64FMTD "] updatetype: %u", GetPlayer()->GetGUID(), updateType); uint64 guid = GetPlayer()->GetGUID();
uint8 size = dungeons ? dungeons->size() : 0;
sLog.outDebug("SMSG_LFG_UPDATE_PLAYER [" UI64FMTD "] updatetype: %u", guid, updateType);
WorldPacket data(SMSG_LFG_UPDATE_PLAYER, 1 + 1 + (extrainfo ? 1 : 0) * (1 + 1 + 1 + 1 + size * 4 + comment.length())); WorldPacket data(SMSG_LFG_UPDATE_PLAYER, 1 + 1 + (extrainfo ? 1 : 0) * (1 + 1 + 1 + 1 + size * 4 + comment.length()));
data << uint8(updateType); // Lfg Update type data << uint8(updateType); // Lfg Update type
data << uint8(extrainfo); // Extra info data << uint8(extrainfo); // Extra info
if (extrainfo) if (extrainfo)
{ {
data << uint8(queued); // Join the queue data << uint8(queued); // Join the queue
data << uint8(0); // unk - Always 0 data << uint8(0); // unk - Always 0
data << uint8(0); // unk - Always 0 data << uint8(0); // unk - Always 0
data << uint8(size); data << uint8(size);
if (size)
for (LfgDungeonSet::const_iterator it = dungeons->begin(); it != dungeons->end(); ++it) for (LfgDungeonSet::const_iterator it = dungeons->begin(); it != dungeons->end(); ++it)
data << uint32(*it); data << uint32(*it);
data << comment; data << comment;
} }
SendPacket(&data); SendPacket(&data);
} }
void WorldSession::SendLfgUpdateParty(uint8 updateType) void WorldSession::SendLfgUpdateParty(uint8 updateType, LfgDungeonSet* dungeons /* = NULL */, std::string comment /* = "" */)
{ {
if (!GetPlayer()->GetLfgUpdate())
{
sLog.outDebug("SMSG_LFG_UPDATE_PARTY [" UI64FMTD "] updatetype: %u not sent! player flag: false", GetPlayer()->GetGUID(), updateType);
return;
}
bool join = false; bool join = false;
bool extrainfo = false; bool extrainfo = false;
bool queued = false; bool queued = false;
@@ -378,28 +342,26 @@ void WorldSession::SendLfgUpdateParty(uint8 updateType)
break; break;
} }
LfgDungeonSet* dungeons = GetPlayer()->GetLfgDungeons(); uint64 guid = GetPlayer()->GetGUID();
uint8 size = dungeons->size(); uint8 size = dungeons ? dungeons->size() : 0;
std::string comment = GetPlayer()->GetLfgComment();
sLog.outDebug("SMSG_LFG_UPDATE_PARTY [" UI64FMTD "] updatetype: %u", GetPlayer()->GetGUID(), updateType); sLog.outDebug("SMSG_LFG_UPDATE_PARTY [" UI64FMTD "] updatetype: %u", guid, updateType);
WorldPacket data(SMSG_LFG_UPDATE_PARTY, 1 + 1 + (extrainfo ? 1 : 0) * (1 + 1 + 1 + 1 + 1 + size * 4 + comment.length())); WorldPacket data(SMSG_LFG_UPDATE_PARTY, 1 + 1 + (extrainfo ? 1 : 0) * (1 + 1 + 1 + 1 + 1 + size * 4 + comment.length()));
data << uint8(updateType); // Lfg Update type data << uint8(updateType); // Lfg Update type
data << uint8(extrainfo); // Extra info data << uint8(extrainfo); // Extra info
if (extrainfo) if (extrainfo)
{ {
data << uint8(join); // LFG Join data << uint8(join); // LFG Join
data << uint8(queued); // Join the queue data << uint8(queued); // Join the queue
data << uint8(0); // unk - Always 0 data << uint8(0); // unk - Always 0
data << uint8(0); // unk - Always 0 data << uint8(0); // unk - Always 0
for (uint8 i = 0; i < 3; ++i) for (uint8 i = 0; i < 3; ++i)
data << uint8(0); // unk - Always 0 data << uint8(0); // unk - Always 0
data << uint8(size); data << uint8(size);
if (size)
for (LfgDungeonSet::const_iterator it = dungeons->begin(); it != dungeons->end(); ++it) for (LfgDungeonSet::const_iterator it = dungeons->begin(); it != dungeons->end(); ++it)
data << uint32(*it); data << uint32(*it);
data << comment; data << comment;
} }
SendPacket(&data); SendPacket(&data);
src/server/game/Server/WorldSession.h
+3 -3
View File
@@ -730,12 +730,12 @@ class WorldSession
void HandleLfrSearchOpcode(WorldPacket &recv_data); void HandleLfrSearchOpcode(WorldPacket &recv_data);
void HandleLfrLeaveOpcode(WorldPacket &recv_data); void HandleLfrLeaveOpcode(WorldPacket &recv_data);
void SendLfgUpdatePlayer(uint8 updateType); void SendLfgUpdatePlayer(uint8 updateType, std::set<uint32>* dungeons = NULL, std::string comment = "");
void SendLfgUpdateParty(uint8 updateType); void SendLfgUpdateParty(uint8 updateType, std::set<uint32>* dungeons = NULL, std::string comment = "");
void SendLfgRoleChosen(uint64 guid, uint8 roles); void SendLfgRoleChosen(uint64 guid, uint8 roles);
void SendLfgRoleCheckUpdate(LfgRoleCheck *pRoleCheck); void SendLfgRoleCheckUpdate(LfgRoleCheck *pRoleCheck);
void SendLfgUpdateSearch(bool update); void SendLfgUpdateSearch(bool update);
void SendLfgJoinResult(uint8 checkResult, uint8 checkValue = 0, std::map<uint32, std::set<LfgLockStatus*>*> *playersLockMap = NULL /* LfgLockStatusMap *playersLockMap = NULL */); void SendLfgJoinResult(uint8 checkResult, uint8 checkValue = 0, std::map<uint32, std::set<LfgLockStatus*>*> *playersLockMap = NULL);
void SendLfgQueueStatus(uint32 dungeon, int32 waitTime, int32 avgWaitTime, int32 waitTimeTanks, int32 waitTimeHealer, int32 waitTimeDps, uint32 queuedTime, uint8 tanks, uint8 healers, uint8 dps); void SendLfgQueueStatus(uint32 dungeon, int32 waitTime, int32 avgWaitTime, int32 waitTimeTanks, int32 waitTimeHealer, int32 waitTimeDps, uint32 queuedTime, uint8 tanks, uint8 healers, uint8 dps);
void SendLfgPlayerReward(uint32 rdungeonEntry, uint32 sdungeonEntry, uint8 done, const LfgReward *reward, const Quest *qRew); void SendLfgPlayerReward(uint32 rdungeonEntry, uint32 sdungeonEntry, uint8 done, const LfgReward *reward, const Quest *qRew);
void SendLfgBootPlayer(LfgPlayerBoot *pBoot); void SendLfgBootPlayer(LfgPlayerBoot *pBoot);