feat(Core/LFG): RDF CF (#22360)
This commit is contained in:
committed by
GitHub
parent
04547d90b3
commit
f0a38b3091
@@ -1495,6 +1495,11 @@ namespace lfg
|
|||||||
for (LfgLockMap::const_iterator it2 = cachedLockMap.begin(); it2 != cachedLockMap.end() && !dungeons.empty(); ++it2)
|
for (LfgLockMap::const_iterator it2 = cachedLockMap.begin(); it2 != cachedLockMap.end() && !dungeons.empty(); ++it2)
|
||||||
{
|
{
|
||||||
uint32 dungeonId = (it2->first & 0x00FFFFFF); // Compare dungeon ids
|
uint32 dungeonId = (it2->first & 0x00FFFFFF); // Compare dungeon ids
|
||||||
|
|
||||||
|
// Skip faction-specific locks if cross-faction is enabled
|
||||||
|
if (sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GROUP) && (it2->second == LFG_LOCKSTATUS_QUEST_NOT_COMPLETED || it2->second == LFG_LOCKSTATUS_MISSING_ITEM))
|
||||||
|
continue;
|
||||||
|
|
||||||
LfgDungeonSet::iterator itDungeon = dungeons.find(dungeonId);
|
LfgDungeonSet::iterator itDungeon = dungeons.find(dungeonId);
|
||||||
if (itDungeon != dungeons.end())
|
if (itDungeon != dungeons.end())
|
||||||
{
|
{
|
||||||
@@ -1670,11 +1675,8 @@ namespace lfg
|
|||||||
}
|
}
|
||||||
else if (group != grp)
|
else if (group != grp)
|
||||||
{
|
{
|
||||||
// pussywizard:
|
|
||||||
if (!grp->IsFull())
|
if (!grp->IsFull())
|
||||||
grp->AddMember(player);
|
grp->AddMember(player);
|
||||||
//else // some cleanup? LeaveLFG?
|
|
||||||
// ;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
grp->SetLfgRoles(pguid, proposal.players.find(pguid)->second.role);
|
grp->SetLfgRoles(pguid, proposal.players.find(pguid)->second.role);
|
||||||
@@ -2685,6 +2687,12 @@ namespace lfg
|
|||||||
LFGQueue& LFGMgr::GetQueue(ObjectGuid guid)
|
LFGQueue& LFGMgr::GetQueue(ObjectGuid guid)
|
||||||
{
|
{
|
||||||
uint8 queueId = 0;
|
uint8 queueId = 0;
|
||||||
|
if (sWorld->getBoolConfig(CONFIG_ALLOW_TWO_SIDE_INTERACTION_GROUP))
|
||||||
|
{
|
||||||
|
queueId = TEAM_ALLIANCE;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
if (guid.IsGroup())
|
if (guid.IsGroup())
|
||||||
{
|
{
|
||||||
LfgGuidSet const& players = GetPlayers(guid);
|
LfgGuidSet const& players = GetPlayers(guid);
|
||||||
@@ -2696,6 +2704,7 @@ namespace lfg
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
queueId = GetTeam(guid);
|
queueId = GetTeam(guid);
|
||||||
|
}
|
||||||
return QueuesStore[queueId];
|
return QueuesStore[queueId];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user