From b5b03a7be03e85722f5738842e6f7fef246253d7 Mon Sep 17 00:00:00 2001 From: Duarte Duarte Date: Thu, 19 Oct 2017 21:59:02 +0100 Subject: Core/ObjectMgr: Replace ABORT() with defaulting to faction 35 when faction template does not exist in DB (#20655) --- src/server/game/Globals/ObjectMgr.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server') diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index 1633b73cb14..cb1e3255672 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -870,8 +870,8 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo) FactionTemplateEntry const* factionTemplate = sFactionTemplateStore.LookupEntry(cInfo->faction); if (!factionTemplate) { - TC_LOG_FATAL("sql.sql", "Creature (Entry: %u) has non-existing faction template (%u). This can lead to crashes, aborting.", cInfo->Entry, cInfo->faction); - ABORT(); + TC_LOG_ERROR("sql.sql", "Creature (Entry: %u) has non-existing faction template (%u). This can lead to crashes, set to faction 35.", cInfo->Entry, cInfo->faction); + factionTemplate = sFactionTemplateStore.AssertEntry(35); } // used later for scale -- cgit v1.2.3