From bac3eda135741f79d22270d0cb0ce38f9f32d423 Mon Sep 17 00:00:00 2001 From: ihm-tswow <76849026+ihm-tswow@users.noreply.github.com> Date: Wed, 3 Aug 2022 09:24:05 +0200 Subject: Core/Misc: Improve missing class health/mana data error message during startup (#28173) - If the class lacks health/mana data entirely, pClassInfo is null and crashes without reaching the error message if we don't check it first. --- src/server/game/Globals/ObjectMgr.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index ec69ece5bc5..a7ba9650d1c 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -4352,7 +4352,7 @@ void ObjectMgr::LoadPlayerInfo() auto& pClassInfo = _playerClassInfo[class_]; // fatal error if no level 1 data - if (!pClassInfo->levelInfo || pClassInfo->levelInfo[0].basehealth == 0) + if (!pClassInfo || !pClassInfo->levelInfo || pClassInfo->levelInfo[0].basehealth == 0) { TC_LOG_ERROR("sql.sql", "Class %i Level 1 does not have health/mana data!", class_); ABORT(); -- cgit v1.2.3