@@ -1496,10 +1496,6 @@ namespace lfg
|
|||||||
{
|
{
|
||||||
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())
|
||||||
{
|
{
|
||||||
@@ -2687,24 +2683,17 @@ 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))
|
if (guid.IsGroup())
|
||||||
{
|
{
|
||||||
queueId = TEAM_ALLIANCE;
|
LfgGuidSet const& players = GetPlayers(guid);
|
||||||
|
ObjectGuid pguid = players.empty() ? ObjectGuid::Empty : (*players.begin());
|
||||||
|
if (pguid)
|
||||||
|
queueId = GetTeam(pguid);
|
||||||
|
else
|
||||||
|
queueId = GetTeam(GetLeader(guid));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
queueId = GetTeam(guid);
|
||||||
if (guid.IsGroup())
|
|
||||||
{
|
|
||||||
LfgGuidSet const& players = GetPlayers(guid);
|
|
||||||
ObjectGuid pguid = players.empty() ? ObjectGuid::Empty : (*players.begin());
|
|
||||||
if (pguid)
|
|
||||||
queueId = GetTeam(pguid);
|
|
||||||
else
|
|
||||||
queueId = GetTeam(GetLeader(guid));
|
|
||||||
}
|
|
||||||
else
|
|
||||||
queueId = GetTeam(guid);
|
|
||||||
}
|
|
||||||
return QueuesStore[queueId];
|
return QueuesStore[queueId];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user