aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2019-01-11 22:31:02 +0100
committerShauren <shauren.trinity@gmail.com>2021-11-21 14:35:00 +0100
commitc2eff8fabcc348d20bcbde19b5db0f76c3d7738e (patch)
tree1fe2a95d1e842db17277b8e0fe757639321ebcfa
parente26b66774266d033a0affd3b8dcf7f68892955d4 (diff)
Core/LFG: Ignore LFG cooldown when joining queue to replace missing party member when dungeon is already in progress
(cherry picked from commit 7fb52334b2fea4bdd3a83c6af4dbcc39cacb41a9)
-rw-r--r--src/server/game/DungeonFinding/LFGMgr.cpp4
1 files changed, 2 insertions, 2 deletions
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;