From ee6e27a1d63953e80760ba6d88792abf8f966b0b Mon Sep 17 00:00:00 2001 From: treeston Date: Tue, 4 Oct 2016 13:49:05 +0200 Subject: Various: Fix coverity reported issues. (cherry picked from commit 84cf239fdafbe12d7a5a695c57eff1f7a1cb42e3) Core/Scripts: kill whitespace (cherry picked from commit 83771597c1f1ed8089270e83091f7fb01df186d1) --- src/server/game/Scripting/ScriptMgr.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/server/game/Scripting/ScriptMgr.cpp') diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index d9c5427247b..97e1410bd0f 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -1712,6 +1712,8 @@ bool ScriptMgr::CanSpawn(ObjectGuid::LowType spawnId, uint32 entry, CreatureTemp ASSERT(actTemplate); CreatureTemplate const* baseTemplate = sObjectMgr->GetCreatureTemplate(entry); + if (!baseTemplate) + baseTemplate = actTemplate; GET_SCRIPT_RET(CreatureScript, baseTemplate->ScriptID, tmpscript, true); return tmpscript->CanSpawn(spawnId, entry, baseTemplate, actTemplate, cData, map); } -- cgit v1.2.3