diff options
| author | Krudor <erikstrandberg93@hotmail.com> | 2017-03-18 11:31:31 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-03-18 11:31:31 +0100 |
| commit | 5a36a2eb17aeec937b4375f341239fdb9dce5fda (patch) | |
| tree | eac8a498a243fa145877636402f8bf86528a7cfb /src/server/game/Scripting/ScriptMgr.cpp | |
| parent | 0a35c473c8df41ec5e0699873e0746700eeb6b41 (diff) | |
Core/Scripts: Add support for spawn specific C++ scripts
Closes #19247
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.cpp')
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index 97e1410bd0f..4bb870e9e0a 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -1714,7 +1714,7 @@ bool ScriptMgr::CanSpawn(ObjectGuid::LowType spawnId, uint32 entry, CreatureTemp CreatureTemplate const* baseTemplate = sObjectMgr->GetCreatureTemplate(entry); if (!baseTemplate) baseTemplate = actTemplate; - GET_SCRIPT_RET(CreatureScript, baseTemplate->ScriptID, tmpscript, true); + GET_SCRIPT_RET(CreatureScript, (cData ? cData->ScriptId : baseTemplate->ScriptID), tmpscript, true); return tmpscript->CanSpawn(spawnId, entry, baseTemplate, actTemplate, cData, map); } |