From 8ef673eda8ca76c6667cd13decd772be6a289559 Mon Sep 17 00:00:00 2001 From: Spp Date: Tue, 21 Sep 2010 10:16:54 +0200 Subject: Core/Dungeon Finder: Check if system is enabled in some functions before doing anything else --HG-- branch : trunk --- src/server/game/DungeonFinding/LFGMgr.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/server/game') diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 45e5640c3d5..7cc05d27433 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -700,8 +700,9 @@ void LFGMgr::Join(Player* plr) /// Group (could be NULL) void LFGMgr::Leave(Player* plr, Group* grp /* = NULL*/) { - if (plr && !plr->GetLfgUpdate()) + if ((plr && !plr->GetLfgUpdate()) || !sWorld.getBoolConfig(CONFIG_DUNGEON_FINDER_ENABLE)) return; + uint64 guid = grp ? grp->GetGUID() : plr ? plr->GetGUID() : 0; sLog.outError("DEBUG:LFGMgr::Leave: [" UI64FMTD "]", guid); @@ -763,6 +764,9 @@ void LFGMgr::Leave(Player* plr, Group* grp /* = NULL*/) /// Group than needs new players void LFGMgr::OfferContinue(Group* grp) { + if (!sWorld.getBoolConfig(CONFIG_DUNGEON_FINDER_ENABLE)) + return; + ASSERT(grp); if (Player* leader = sObjectMgr.GetPlayer(grp->GetLeaderGUID())) leader->GetSession()->SendLfgOfferContinue(grp->GetLfgDungeonEntry(false)); @@ -1832,7 +1836,7 @@ void LFGMgr::TeleportPlayer(Player* plr, bool out) void LFGMgr::RewardDungeonDoneFor(const uint32 dungeonId, Player* player) { Group* group = player->GetGroup(); - if (!group || !group->isLFGGroup()) + if ((!group || !group->isLFGGroup()) || !sWorld.getBoolConfig(CONFIG_DUNGEON_FINDER_ENABLE)) return; // Mark dungeon as finished -- cgit v1.2.3