diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Conditions/DisableMgr.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Conditions/DisableMgr.h | 3 | ||||
| -rw-r--r-- | src/server/game/DungeonFinding/LFGMgr.cpp | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/server/game/Conditions/DisableMgr.cpp b/src/server/game/Conditions/DisableMgr.cpp index 11c79e99b81..2a735548c33 100644 --- a/src/server/game/Conditions/DisableMgr.cpp +++ b/src/server/game/Conditions/DisableMgr.cpp @@ -42,7 +42,7 @@ namespace DisableMap m_DisableMap; - uint8 MAX_DISABLE_TYPES = 8; + uint8 MAX_DISABLE_TYPES = 9; } void LoadDisables() @@ -118,6 +118,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) @@ -344,6 +345,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 cae1e0329e8..b318a4bf852 100644 --- a/src/server/game/Conditions/DisableMgr.h +++ b/src/server/game/Conditions/DisableMgr.h @@ -33,7 +33,8 @@ enum DisableType DISABLE_TYPE_ACHIEVEMENT_CRITERIA = 4, DISABLE_TYPE_OUTDOORPVP = 5, DISABLE_TYPE_VMAP = 6, - DISABLE_TYPE_MMAP = 7 + DISABLE_TYPE_MMAP = 7, + DISABLE_TYPE_LFG_MAP = 8 }; enum SpellDisableTypes diff --git a/src/server/game/DungeonFinding/LFGMgr.cpp b/src/server/game/DungeonFinding/LFGMgr.cpp index 4ca1a68c048..cb2335e9c7c 100644 --- a/src/server/game/DungeonFinding/LFGMgr.cpp +++ b/src/server/game/DungeonFinding/LFGMgr.cpp @@ -1605,6 +1605,8 @@ LfgLockMap const LFGMgr::GetLockedDungeons(ObjectGuid guid) lockData = LFG_LOCKSTATUS_INSUFFICIENT_EXPANSION; else if (DisableMgr::IsDisabledFor(DISABLE_TYPE_MAP, dungeon->map, player)) lockData = LFG_LOCKSTATUS_RAID_LOCKED; + else if (DisableMgr::IsDisabledFor(DISABLE_TYPE_LFG_MAP, dungeon->map, player)) + lockData = LFG_LOCKSTATUS_RAID_LOCKED; else if (dungeon->difficulty > DUNGEON_DIFFICULTY_NORMAL && player->GetBoundInstance(dungeon->map, Difficulty(dungeon->difficulty))) lockData = LFG_LOCKSTATUS_RAID_LOCKED; else if (dungeon->minlevel > level) |