From ca904171caee9a550eff2dac7c7941fb35380caa Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Fri, 11 Jan 2019 22:40:46 +0100 Subject: [PATCH] Core/LFG: merged commit 7fb52334b2fea4bdd3a83c6af4dbcc39cacb41a9 --- src/server/game/DungeonFinding/LFGMgr.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 8dd817fb823..fe933d29427 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -451,7 +451,7 @@ void LFGMgr::JoinLfg(Player* player, uint8 roles, LfgDungeonSet& dungeons, const joinData.result = LFG_JOIN_USING_BG_SYSTEM; else if (player->HasAura(LFG_SPELL_DUNGEON_DESERTER)) joinData.result = LFG_JOIN_DESERTER; - else if (player->HasAura(LFG_SPELL_DUNGEON_COOLDOWN)) + else if (!isContinue && player->HasAura(LFG_SPELL_DUNGEON_COOLDOWN)) joinData.result = LFG_JOIN_RANDOM_COOLDOWN; else if (dungeons.empty()) joinData.result = LFG_JOIN_NOT_MEET_REQS; @@ -472,7 +472,7 @@ void LFGMgr::JoinLfg(Player* player, uint8 roles, LfgDungeonSet& dungeons, const joinData.result = LFG_JOIN_INTERNAL_ERROR; if (plrg->HasAura(LFG_SPELL_DUNGEON_DESERTER)) joinData.result = LFG_JOIN_PARTY_DESERTER; - else if (plrg->HasAura(LFG_SPELL_DUNGEON_COOLDOWN)) + else if (!isContinue && plrg->HasAura(LFG_SPELL_DUNGEON_COOLDOWN)) joinData.result = LFG_JOIN_PARTY_RANDOM_COOLDOWN; else if (plrg->InBattleground() || plrg->InArena() || plrg->InBattlegroundQueue()) joinData.result = LFG_JOIN_USING_BG_SYSTEM; @@ -481,8 +481,7 @@ void LFGMgr::JoinLfg(Player* player, uint8 roles, LfgDungeonSet& dungeons, const } } - if ((joinData.result == LFG_JOIN_OK && memberCount != grp->GetMembersCount()) - || (joinData.result == LFG_JOIN_PARTY_RANDOM_COOLDOWN && grp->isLFGGroup() && memberCount != grp->GetMembersCount())) + if (joinData.result == LFG_JOIN_OK && memberCount != grp->GetMembersCount()) joinData.result = LFG_JOIN_DISCONNECTED; } }