- Merge fix

This commit is contained in:
kadeshar
2026-03-07 18:29:14 +01:00
parent 380df7600b
commit 0fb9abd140

View File

@@ -22,6 +22,7 @@
#include "Errors.h"
#include "LFGMgr.h"
#include "Log.h"
#include "RaceMgr.h"
#include "SharedDefines.h"
#include "SpellMgr.h"
#include "TransportMgr.h"
@@ -416,7 +417,7 @@ void LoadDBCStores(const std::string& dataPath)
sCharStartOutfitMap[outfit->Race | (outfit->Class << 8) | (outfit->Gender << 16)] = outfit;
for (CharSectionsEntry const* charSection : sCharSectionsStore)
if (charSection->Race && ((1 << (charSection->Race - 1)) & RACEMASK_ALL_PLAYABLE) != 0) //ignore Nonplayable races
if (charSection->Race && ((1 << (charSection->Race - 1)) & sRaceMgr->GetPlayableRaceMask()) != 0) //ignore Nonplayable races
sCharSectionMap.insert({ charSection->GenType | (charSection->Gender << 8) | (charSection->Race << 16), charSection });
for (FactionEntry const* faction : sFactionStore)
@@ -1012,4 +1013,4 @@ AreaTableEntry const* GetAreaEntryByAreaFlagAndMap(uint32 area_flag, uint32 map_
return GetAreaEntryByAreaID(mapEntry->linked_zone);
return nullptr;
}
}