diff options
| author | Spp <spp@jorge.gr> | 2012-10-23 14:16:05 +0200 |
|---|---|---|
| committer | Spp <spp@jorge.gr> | 2012-10-23 14:16:05 +0200 |
| commit | 60d4343d8e8183e170ec833b43ec1254d5752c80 (patch) | |
| tree | 718b83fa9d886610bb281785d6a19b3ea0d5ba4a /src/server/game/Handlers/LFGHandler.cpp | |
| parent | b73a5f32b07c227abc9c03a3348bf6d786107c30 (diff) | |
| parent | 663db1cee3ab9bd3de76f210bc7c178f4991953e (diff) | |
Merge branch 'master' into 4.3.4
Conflicts:
src/server/game/Spells/Spell.cpp
src/server/shared/Logging/Appender.h
Diffstat (limited to 'src/server/game/Handlers/LFGHandler.cpp')
| -rwxr-xr-x | src/server/game/Handlers/LFGHandler.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Handlers/LFGHandler.cpp b/src/server/game/Handlers/LFGHandler.cpp index 9f25f0e9c86..f95e7489870 100755 --- a/src/server/game/Handlers/LFGHandler.cpp +++ b/src/server/game/Handlers/LFGHandler.cpp @@ -48,7 +48,7 @@ void BuildPartyLockDungeonBlock(WorldPacket& data, const LfgLockPartyMap& lockMa void WorldSession::HandleLfgJoinOpcode(WorldPacket& recvData) { - if (!sWorld->getBoolConfig(CONFIG_DUNGEON_FINDER_ENABLE) || + if (!sLFGMgr->isOptionEnabled(LFG_OPTION_ENABLE_DUNGEON_FINDER | LFG_OPTION_ENABLE_RAID_BROWSER) || (GetPlayer()->GetGroup() && GetPlayer()->GetGroup()->GetLeaderGUID() != GetPlayer()->GetGUID() && (GetPlayer()->GetGroup()->GetMembersCount() == MAXGROUPSIZE || !GetPlayer()->GetGroup()->isLFGGroup()))) { |