aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Globals/ObjectMgr.cpp
diff options
context:
space:
mode:
authorMeji <alvaro.megias@outlook.com>2024-06-08 12:48:45 +0200
committerGitHub <noreply@github.com>2024-06-08 12:48:45 +0200
commitef70cf64814341543fdb8efa403319371d9f3104 (patch)
tree7c1f87dce911eed8218effccf8b193647b8ec323 /src/server/game/Globals/ObjectMgr.cpp
parent7a8e0f8979669c42e6f9f2460d786e4f58f761f8 (diff)
Core/Creatures: Validate creature.modelid on startup (#30023)
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 b0d86166f3d..5aed2de438a 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -2228,6 +2228,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)
{