Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Creatures: skip model gender randomization for creatures that have their display ID overriden in creature table

Browse Source
This commit is contained in:
Ovahlord
2020-10-29 18:03:16 +01:00
parent 4a324b3b2f
commit 0008916251
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -513,7 +513,12 @@ bool Creature::InitEntry(uint32 entry, CreatureData const* data /*= nullptr*/)
}
uint32 displayID = ObjectMgr::ChooseDisplayId(GetCreatureTemplate(), data);
CreatureModelInfo const* minfo = sObjectMgr->GetCreatureModelRandomGender(&displayID);
CreatureModelInfo const* minfo = nullptr;
if (!data || !data->displayid)
minfo = sObjectMgr->GetCreatureModelRandomGender(&displayID);
else
minfo = sObjectMgr->GetCreatureModelInfo(displayID);
if (!minfo) // Cancel load if no model defined
{
TC_LOG_ERROR("sql.sql", "Creature (Entry: %u) has invalid model %u defined in table `creature_template`, can't load.", entry, displayID);