From c2eff8fabcc348d20bcbde19b5db0f76c3d7738e Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 11 Jan 2019 22:31:02 +0100 Subject: Core/LFG: Ignore LFG cooldown when joining queue to replace missing party member when dungeon is already in progress (cherry picked from commit 7fb52334b2fea4bdd3a83c6af4dbcc39cacb41a9) --- src/server/game/DungeonFinding/LFGMgr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index e5492ee90dc..8e7d941244c 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -427,7 +427,7 @@ void LFGMgr::JoinLfg(Player* player, uint8 roles, LfgDungeonSet& dungeons) joinData.result = LFG_JOIN_CANT_USE_DUNGEONS; else if (player->HasAura(LFG_SPELL_DUNGEON_DESERTER)) joinData.result = LFG_JOIN_DESERTER_PLAYER; - else if (player->HasAura(LFG_SPELL_DUNGEON_COOLDOWN)) + else if (!isContinue && player->HasAura(LFG_SPELL_DUNGEON_COOLDOWN)) joinData.result = LFG_JOIN_RANDOM_COOLDOWN_PLAYER; else if (dungeons.empty()) joinData.result = LFG_JOIN_NO_SLOTS; @@ -448,7 +448,7 @@ void LFGMgr::JoinLfg(Player* player, uint8 roles, LfgDungeonSet& dungeons) joinData.result = LFG_JOIN_NO_LFG_OBJECT; if (plrg->HasAura(LFG_SPELL_DUNGEON_DESERTER)) joinData.result = LFG_JOIN_DESERTER_PARTY; - else if (plrg->HasAura(LFG_SPELL_DUNGEON_COOLDOWN)) + else if (!isContinue && plrg->HasAura(LFG_SPELL_DUNGEON_COOLDOWN)) joinData.result = LFG_JOIN_RANDOM_COOLDOWN_PARTY; else if (plrg->InBattleground() || plrg->InArena() || plrg->InBattlegroundQueue()) joinData.result = LFG_JOIN_CANT_USE_DUNGEONS; -- cgit v1.2.3