From 1ce01c8dad828c3f36f904bb1b1fe8002da7b2c6 Mon Sep 17 00:00:00 2001 From: Tereneckla Date: Thu, 10 Jul 2025 12:56:11 +0000 Subject: [PATCH] fix(Core/LFG): revert #22360 (#22436) --- src/server/game/DungeonFinding/LFGMgr.cpp | 27 +++++++---------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index fd59cb6eb..2449fada7 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -1496,10 +1496,6 @@ namespace lfg { 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); if (itDungeon != dungeons.end()) { @@ -2687,24 +2683,17 @@ namespace lfg LFGQueue& LFGMgr::GetQueue(ObjectGuid guid) { 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 - { - 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); - } + queueId = GetTeam(guid); return QueuesStore[queueId]; }