From 0008916251deaf1dc076d2977ecbb246b412d009 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Thu, 29 Oct 2020 18:03:16 +0100 Subject: [PATCH] Core/Creatures: skip model gender randomization for creatures that have their display ID overriden in creature table --- src/server/game/Entities/Creature/Creature.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index e7a96366941..6a62e258d3c 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -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);