aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDuarte Duarte <dnpd.dd@gmail.com>2017-10-19 21:59:02 +0100
committerShauren <shauren.trinity@gmail.com>2017-10-19 22:59:02 +0200
commitb5b03a7be03e85722f5738842e6f7fef246253d7 (patch)
treea9f28f60bbd28c9812d738227b2a0c9e7609685a /src
parent83d3c117f94e2482635731d87b1f4d16711fc50c (diff)
Core/ObjectMgr: Replace ABORT() with defaulting to faction 35 when faction template does not exist in DB (#20655)
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Globals/ObjectMgr.cpp4
1 files changed, 2 insertions, 2 deletions
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