Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-27 04:12:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/DataStores: Update DBC field names to generated ones (#24999)

Browse Source
This commit is contained in:
Peter Keresztes Schmidt
2020-07-12 15:36:55 +02:00
committed by GitHub
parent 3529442668
commit c92950b3e1
105 changed files with 2268 additions and 2246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Maps/MapManager.cpp
View File

@@ -139,7 +139,7 @@ Map::EnterState MapManager::PlayerCannotEnter(uint32 mapid, Player* player, bool
Difficulty targetDifficulty, requestedDifficulty;
targetDifficulty = requestedDifficulty = player->GetDifficulty(entry->IsRaid());
// Get the highest available difficulty if current setting is higher than the instance allows
MapDifficulty const* mapDiff = GetDownscaledMapDifficultyData(entry->MapID, targetDifficulty);
MapDifficulty const* mapDiff = GetDownscaledMapDifficultyData(entry->ID, targetDifficulty);
if (!mapDiff)
return Map::CANNOT_ENTER_DIFFICULTY_UNAVAILABLE;
@@ -151,7 +151,7 @@ Map::EnterState MapManager::PlayerCannotEnter(uint32 mapid, Player* player, bool
if (!player->Satisfy(sObjectMgr->GetAccessRequirement(mapid, targetDifficulty), mapid, true))
return Map::CANNOT_ENTER_UNSPECIFIED_REASON;
char const* mapName = entry->name[player->GetSession()->GetSessionDbcLocale()];
char const* mapName = entry->MapName[player->GetSession()->GetSessionDbcLocale()];
Group* group = player->GetGroup();
if (entry->IsRaid()) // can only enter in a raid group