diff options
| author | treeston <treeston.mmoc@gmail.com> | 2016-10-04 13:49:05 +0200 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-03-05 01:19:55 +0100 |
| commit | ee6e27a1d63953e80760ba6d88792abf8f966b0b (patch) | |
| tree | ab7c086d3c95fa4dc570176f3ff9718a512920b3 /src/server/game/Scripting/ScriptMgr.cpp | |
| parent | 70a8b74fe6ac33905303e6f8edd89d4256ddc868 (diff) | |
Various: Fix coverity reported issues.
(cherry picked from commit 84cf239fdafbe12d7a5a695c57eff1f7a1cb42e3)
Core/Scripts: kill whitespace
(cherry picked from commit 83771597c1f1ed8089270e83091f7fb01df186d1)
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.cpp')
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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); } |