diff options
| author | Aokromes <Aokromes@users.noreply.github.com> | 2016-11-26 02:50:17 +0100 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2018-02-11 16:39:16 +0100 |
| commit | c7604d87cf5edb9819968cd8ac1377842e14ff21 (patch) | |
| tree | 67c4df088acc4e068349c86d4adb2384f357b09c | |
| parent | 9c6a43327f2b633bee085f7707e02289701c00e0 (diff) | |
Core/DungeonFinder: disable map only for LFG (#17784)
(cherry picked from commit 46ee3881e6ef34855484234dcfd72b9b17d87e1d)
| -rw-r--r-- | src/server/game/Conditions/DisableMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Conditions/DisableMgr.h | 1 | ||||
| -rw-r--r-- | src/server/game/DungeonFinding/LFGMgr.cpp | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index 898cdcbf8ed..28b69af1274 100644 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -126,6 +126,7 @@ void LoadDisables() case DISABLE_TYPE_QUEST: break; case DISABLE_TYPE_MAP: + case DISABLE_TYPE_LFG_MAP: { MapEntry const* mapEntry = sMapStore.LookupEntry(entry); if (!mapEntry) @@ -325,6 +326,7 @@ bool IsDisabledFor(DisableType type, uint32 entry, Unit const* unit, uint8 flags break; } case DISABLE_TYPE_MAP: + case DISABLE_TYPE_LFG_MAP: if (Player const* player = unit->ToPlayer()) { MapEntry const* mapEntry = sMapStore.LookupEntry(entry); diff --git a/src/server/game/Conditions/DisableMgr.h b/src/server/game/Conditions/DisableMgr.h index af910c54b10..816bc76d04b 100644 --- a/src/server/game/Conditions/DisableMgr.h +++ b/src/server/game/Conditions/DisableMgr.h @@ -33,6 +33,7 @@ enum DisableType DISABLE_TYPE_OUTDOORPVP = 5, DISABLE_TYPE_VMAP = 6, DISABLE_TYPE_MMAP = 7, + DISABLE_TYPE_LFG_MAP = 8, MAX_DISABLE_TYPES }; diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 32928afcf8f..18ca6f2881c 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -1630,6 +1630,8 @@ LfgLockMap const LFGMgr::GetLockedDungeons(ObjectGuid guid) lockStatus = LFG_LOCKSTATUS_INSUFFICIENT_EXPANSION; else if (DisableMgr::IsDisabledFor(DISABLE_TYPE_MAP, dungeon->map, player)) lockStatus = LFG_LOCKSTATUS_RAID_LOCKED; + else if (DisableMgr::IsDisabledFor(DISABLE_TYPE_LFG_MAP, dungeon->map, player)) + lockStatus = LFG_LOCKSTATUS_RAID_LOCKED; else if (dungeon->difficulty > DIFFICULTY_NORMAL && player->GetBoundInstance(dungeon->map, Difficulty(dungeon->difficulty))) lockStatus = LFG_LOCKSTATUS_RAID_LOCKED; else if (dungeon->minlevel > level) |