nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-25 06:36:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core/ObjectMgr): Load Creatures.CustomIDs into stores (#14835)

Browse Source
This commit is contained in:
Kitzunu
2023-02-05 13:32:41 +01:00
committed by GitHub
parent dba8c49bce
commit 409c7356ea
3 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/server/game/Globals/ObjectMgr.cpp
View File

@@ -841,6 +841,21 @@ void ObjectMgr::LoadCreatureTemplateAddons()
LOG_INFO("server.loading", " ");
}
/**
* @brief Load config option Creatures.CustomIDs into Store
*/
void ObjectMgr::LoadCreatureCustomIDs()
{
// Hack for modules
std::string stringCreatureIds = sConfigMgr->GetOption<std::string>("Creatures.CustomIDs", "");
std::vector<std::string_view> CustomCreatures = Acore::Tokenize(stringCreatureIds, ',', false);
for (auto itr : CustomCreatures)
{
_creatureCustomIDsStore.push_back(Acore::StringTo<uint32>(itr).value());
}
}
void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo)
{
if (!cInfo)
@@ -1183,15 +1198,7 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo)
const_cast<CreatureTemplate*>(cInfo)->DamageModifier *= Creature::_GetDamageMod(cInfo->rank);
// Hack for modules
std::vector<uint32> CustomCreatures;
std::string stringCreatureIds(sConfigMgr->GetOption<std::string>("Creatures.CustomIDs", ""));
for (std::string_view id : Acore::Tokenize(stringCreatureIds, ',', false))
{
uint32 entry = Acore::StringTo<uint32>(id).value_or(0);
CustomCreatures.emplace_back(entry);
}
for (auto const& itr : CustomCreatures)
for (auto itr : _creatureCustomIDsStore)
{
if (cInfo->Entry == itr)
return;

4
src/server/game/Globals/ObjectMgr.h
View File

@@ -672,6 +672,8 @@ typedef std::unordered_map<uint32, VendorItemData> CacheVendorItemContainer;
typedef std::unordered_map<uint32, TrainerSpellData> CacheTrainerSpellContainer;
typedef std::unordered_map<uint32, ServerMail> ServerMailContainer;
typedef std::vector<uint32> CreatureCustomIDsContainer;
enum SkillRangeType
{
SKILL_RANGE_LANGUAGE, // 300..300
@@ -1020,6 +1022,7 @@ public:
void LoadCreatureTemplateAddons();
void LoadCreatureTemplateResistances();
void LoadCreatureTemplateSpells();
void LoadCreatureCustomIDs();
void CheckCreatureTemplate(CreatureTemplate const* cInfo);
void CheckCreatureMovement(char const* table, uint64 id, CreatureMovementData& creatureMovement);
void LoadGameObjectQuestItems();
@@ -1555,6 +1558,7 @@ private:
CellObjectGuids _emptyCellObjectGuids;
CreatureDataContainer _creatureDataStore;
CreatureTemplateContainer _creatureTemplateStore;
CreatureCustomIDsContainer _creatureCustomIDsStore;
std::vector<CreatureTemplate*> _creatureTemplateStoreFast; // pussywizard
CreatureModelContainer _creatureModelStore;
CreatureAddonContainer _creatureAddonStore;

3
src/server/game/World/World.cpp
View File

@@ -1697,6 +1697,9 @@ void World::SetInitialWorldSettings()
LOG_INFO("server.loading", "Loading Creature Model Based Info Data...");
sObjectMgr->LoadCreatureModelInfo();
LOG_INFO("server.loading", "Loading Creature Custom IDs Config...");
sObjectMgr->LoadCreatureCustomIDs();
LOG_INFO("server.loading", "Loading Creature Templates...");
sObjectMgr->LoadCreatureTemplates();