aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSpp <none@none>2010-09-28 17:49:30 +0200
committerSpp <none@none>2010-09-28 17:49:30 +0200
commitb4b3eeee10190a523696349c47d24511f91213cf (patch)
tree25aad0b721de21ff102a9442c1f5c683b744fe54 /src
parentd2117fd4ee1b0d85a3acd1ebe226ce9e77cea9ef (diff)
Core/Dungeon Finder: Do not allow to join LFG if queued to Battleground or Arena
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/server/game/DungeonFinding/LFGMgr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp
index 939a48b1dc1..79bd537e5b5 100644
--- a/src/server/game/DungeonFinding/LFGMgr.cpp
+++ b/src/server/game/DungeonFinding/LFGMgr.cpp
@@ -576,7 +576,7 @@ void LFGMgr::Join(Player* plr)
sLog.outError("LFGMgr::Join: [" UI64FMTD "] trying to join but is already in queue! Forcing leave before readding", guid);
Leave(plr, grp);
}
- else if (plr->InBattleground() || plr->InArena())
+ else if (plr->InBattleground() || plr->InArena() || plr->InBattlegroundQueue())
result = LFG_JOIN_USING_BG_SYSTEM;
else if (plr->HasAura(LFG_SPELL_DUNGEON_DESERTER))
result = LFG_JOIN_DESERTER;