From 064bbd9270da9cc68eaebd234778cfe6dfbaa04c Mon Sep 17 00:00:00 2001 From: ayase <137056643@qq.com> Date: Wed, 30 May 2018 04:57:22 +0800 Subject: [PATCH] LFG - Queue again after dungeon (PR #883) People should now be able to queue again, after last boss is killed. (Closes issue #856) Commits: * fix:Dungeon Queue - Not working(#856) * only the leader can re-queue * Update LFGHandler.cpp --- src/server/game/DungeonFinding/LFGMgr.cpp | 3 ++- src/server/game/Handlers/LFGHandler.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 33c6ec751..5aaaece01 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -495,10 +495,11 @@ void LFGMgr::JoinLfg(Player* player, uint8 roles, LfgDungeonSet& dungeons, const case LFG_STATE_PROPOSAL: // if joining again during proposal joinData.result = LFG_JOIN_INTERNAL_ERROR; break; - case LFG_STATE_FINISHED_DUNGEON: + /*case LFG_STATE_FINISHED_DUNGEON: if (grp && grp->isLFGGroup()) joinData.result = LFG_JOIN_PARTY_NOT_MEET_REQS; break; + */ default: break; } diff --git a/src/server/game/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp index 47a7940ed..ac0c80258 100644 --- a/src/server/game/Handlers/LFGHandler.cpp +++ b/src/server/game/Handlers/LFGHandler.cpp @@ -42,7 +42,7 @@ void WorldSession::HandleLfgJoinOpcode(WorldPacket& recvData) // pussywizard: if (Group* g = GetPlayer()->GetGroup()) - if (g->isLFGGroup() ? g->GetMembersCount() == MAXGROUPSIZE : g->GetLeaderGUID() != GetPlayer()->GetGUID()) + if (g->isLFGGroup() && g->GetLeaderGUID() != GetPlayer()->GetGUID()) { recvData.rfinish(); return;