From ec567f1c41d9956fa2b63d8dba3c7bcf4f6a6f16 Mon Sep 17 00:00:00 2001 From: w1sht0l1v3 Date: Thu, 23 Apr 2015 22:10:15 +0300 Subject: Core/LFG: Move code to a better place. (the case where the last player left inside a dungeon would not be removed from lfg&group when he ports outside) (cherry picked from commit 837a0a75246b177858825caf1861dd61a6b87868) --- src/server/game/DungeonFinding/LFGMgr.cpp | 8 -------- src/server/game/DungeonFinding/LFGScripts.cpp | 10 ++++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'src/server') diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 68798d43e38..0e835e02dc2 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -1273,14 +1273,6 @@ void LFGMgr::TeleportPlayer(Player* player, bool out, bool fromOpcode /*= false* if (player->GetMapId() == uint32(dungeon->map)) player->TeleportToBGEntryPoint(); - // in the case were we are the last in lfggroup then we must disband when porting out of the instance - if (group && group->GetMembersCount() == 1) - { - group->Disband(); - TC_LOG_DEBUG("lfg.teleport", "Player %s is last in lfggroup so we disband the group.", - player->GetName().c_str()); - } - return; } diff --git a/src/server/game/DungeonFinding/LFGScripts.cpp b/src/server/game/DungeonFinding/LFGScripts.cpp index 42e1f4a545f..224cec71d86 100644 --- a/src/server/game/DungeonFinding/LFGScripts.cpp +++ b/src/server/game/DungeonFinding/LFGScripts.cpp @@ -101,7 +101,17 @@ void LFGPlayerScript::OnMapChanged(Player* player) player->CastSpell(player, LFG_SPELL_LUCK_OF_THE_DRAW, true); } else + { + Group* group = player->GetGroup(); + if (group && group->GetMembersCount() == 1) + { + sLFGMgr->LeaveLfg(group->GetGUID()); + group->Disband(); + TC_LOG_DEBUG("lfg", "LFGPlayerScript::OnMapChanged, Player %s(%s) is last in the lfggroup so we disband the group.", + player->GetName().c_str(), player->GetGUID().ToString().c_str()); + } player->RemoveAurasDueToSpell(LFG_SPELL_LUCK_OF_THE_DRAW); + } } LFGGroupScript::LFGGroupScript() : GroupScript("LFGGroupScript") { } -- cgit v1.2.3