diff --git a/src/game/WorldHandlers/World.cpp b/src/game/WorldHandlers/World.cpp index 50e83dba4..844fe6d5c 100644 --- a/src/game/WorldHandlers/World.cpp +++ b/src/game/WorldHandlers/World.cpp @@ -1048,17 +1048,19 @@ void World::SetInitialWorldSettings() ///- Check the existence of the map files for all races start areas. if (!MapManager::ExistMapAndVMap(0, -6240.32f, 331.033f) || // Dwarf/ Gnome - !MapManager::ExistMapAndVMap(0, -8949.95f, -132.493f) || // Human - !MapManager::ExistMapAndVMap(1, -618.518f, -4251.67f) || // Orc - !MapManager::ExistMapAndVMap(0, 1676.35f, 1677.45f) || // Scourge - !MapManager::ExistMapAndVMap(1, 10311.3f, 832.463f) || // NightElf - !MapManager::ExistMapAndVMap(1, -2917.58f, -257.98f) || // Tauren - (m_configUint32Values[CONFIG_UINT32_EXPANSION] >= EXPANSION_TBC && - (!MapManager::ExistMapAndVMap(530, 10349.6f, -6357.29f) || // BloodElf - !MapManager::ExistMapAndVMap(530, -3961.64f, -13931.2f))) || // Draenei - (m_configUint32Values[CONFIG_UINT32_EXPANSION] >= EXPANSION_WOTLK && - !MapManager::ExistMapAndVMap(609, 2355.84f, -5664.77f))) // Death Knight - { + !MapManager::ExistMapAndVMap(0, -8949.95f, -132.493f) || // Human + !MapManager::ExistMapAndVMap(1, -618.518f, -4251.67f) || // Orc + !MapManager::ExistMapAndVMap(0, 1676.35f, 1677.45f) || // Scourge + !MapManager::ExistMapAndVMap(1, 10311.3f, 832.463f) || // NightElf + !MapManager::ExistMapAndVMap(1, -2917.58f, -257.98f) || // Tauren + (m_configUint32Values[CONFIG_UINT32_EXPANSION] >= EXPANSION_TBC && + (!MapManager::ExistMapAndVMap(530, 10349.6f, -6357.29f) || // BloodElf + !MapManager::ExistMapAndVMap(530, -3961.64f, -13931.2f)) || // Draenei + (m_configUint32Values[CONFIG_UINT32_EXPANSION] >= EXPANSION_WOTLK && + !MapManager::ExistMapAndVMap(609, 2355.84f, -5664.77f))) || // Death Knight + (m_configUint32Values[CONFIG_UINT32_EXPANSION] >= EXPANSION_MOP && + !MapManager::ExistMapAndVMap(870, 3001.38f, -542.47f))) // Pandaren + { sLog.outError("Correct *.map files not found in path '%smaps' or *.vmtree/*.vmtile files in '%svmaps'. Please place *.map and vmap files in appropriate directories or correct the DataDir value in the mangosd.conf file.", m_dataPath.c_str(), m_dataPath.c_str()); Log::WaitBeforeContinueIfNeed(); exit(1);