sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable SourceType of 8 for Disables table to disable LFG/LFD maps (#1076)

Browse Source
This commit is contained in:
Chaz
2018-12-11 06:54:15 +00:00
committed by Nefertumm
parent 06b189deb6
commit 8906d1ea26
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Conditions/DisableMgr.cpp
+3 -1
View File
@@ -30,7 +30,7 @@ namespace
DisableMap m_DisableMap; DisableMap m_DisableMap;
uint8 MAX_DISABLE_TYPES = 8; uint8 MAX_DISABLE_TYPES = 9;
} }
void LoadDisables() void LoadDisables()
@@ -123,6 +123,7 @@ void LoadDisables()
case DISABLE_TYPE_QUEST: case DISABLE_TYPE_QUEST:
break; break;
case DISABLE_TYPE_MAP: case DISABLE_TYPE_MAP:
case DISABLE_TYPE_LFG_MAP:
{ {
MapEntry const* mapEntry = sMapStore.LookupEntry(entry); MapEntry const* mapEntry = sMapStore.LookupEntry(entry);
if (!mapEntry) if (!mapEntry)
@@ -320,6 +321,7 @@ bool IsDisabledFor(DisableType type, uint32 entry, Unit const* unit, uint8 flags
break; break;
} }
case DISABLE_TYPE_MAP: case DISABLE_TYPE_MAP:
case DISABLE_TYPE_LFG_MAP:
if (Player const* player = unit->ToPlayer()) if (Player const* player = unit->ToPlayer())
{ {
MapEntry const* mapEntry = sMapStore.LookupEntry(entry); MapEntry const* mapEntry = sMapStore.LookupEntry(entry);
src/server/game/Conditions/DisableMgr.h
+1
View File
@@ -21,6 +21,7 @@ enum DisableType
DISABLE_TYPE_OUTDOORPVP = 5, DISABLE_TYPE_OUTDOORPVP = 5,
DISABLE_TYPE_VMAP = 6, DISABLE_TYPE_VMAP = 6,
DISABLE_TYPE_GO_LOS = 7, DISABLE_TYPE_GO_LOS = 7,
DISABLE_TYPE_LFG_MAP = 8,
}; };
enum SpellDisableTypes enum SpellDisableTypes
src/server/game/DungeonFinding/LFGMgr.cpp
+2
View File
@@ -391,6 +391,8 @@ void LFGMgr::InitializeLockedDungeons(Player* player, uint8 level /* = 0 */)
lockData = LFG_LOCKSTATUS_INSUFFICIENT_EXPANSION; lockData = LFG_LOCKSTATUS_INSUFFICIENT_EXPANSION;
else if (DisableMgr::IsDisabledFor(DISABLE_TYPE_MAP, dungeon->map, player)) else if (DisableMgr::IsDisabledFor(DISABLE_TYPE_MAP, dungeon->map, player))
lockData = LFG_LOCKSTATUS_RAID_LOCKED; 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 && (!mapEntry || !mapEntry->IsRaid()) && sInstanceSaveMgr->PlayerIsPermBoundToInstance(player->GetGUIDLow(), dungeon->map, Difficulty(dungeon->difficulty))) else if (dungeon->difficulty > DUNGEON_DIFFICULTY_NORMAL && (!mapEntry || !mapEntry->IsRaid()) && sInstanceSaveMgr->PlayerIsPermBoundToInstance(player->GetGUIDLow(), dungeon->map, Difficulty(dungeon->difficulty)))
lockData = LFG_LOCKSTATUS_RAID_LOCKED; lockData = LFG_LOCKSTATUS_RAID_LOCKED;
else if (dungeon->minlevel > level) else if (dungeon->minlevel > level)