aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Globals/ObjectMgr.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/Globals/ObjectMgr.cpp')
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 0a71eb8d80a..5385f24cbb8 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -2249,6 +2249,15 @@ void ObjectMgr::LoadCreatures()
continue;
}
+ if (data.display.has_value())
+ {
+ if (!GetCreatureModelInfo(data.display->CreatureDisplayID))
+ {
+ TC_LOG_ERROR("sql.sql", "Table `creature` has creature (GUID: {} Entry: {}) with invalid `modelid` {}, ignoring.", guid, data.id, data.display->CreatureDisplayID);
+ data.display.reset();
+ }
+ }
+
// -1 random, 0 no equipment
if (data.equipmentId != 0)
{