aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Scripting/ScriptMgr.cpp
diff options
context:
space:
mode:
authorAokromes <aokromes@gmail.com>2017-03-26 13:32:28 +0200
committerAokromes <aokromes@gmail.com>2017-03-26 13:32:28 +0200
commit0999ef0b774f2c93beefa6329d1a42a13377a35b (patch)
tree86293ced1ccfbb75d7a422e81b478ac83ef2edc6 /src/server/game/Scripting/ScriptMgr.cpp
parentde4043097e31d7ba968425f0a2ec55a9a1e5b117 (diff)
Core/Scripts: Add support for spawn specific C++ scripts
By Krudor
Diffstat (limited to 'src/server/game/Scripting/ScriptMgr.cpp')
-rw-r--r--src/server/game/Scripting/ScriptMgr.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index 3e19033ef1d..fa2c23c978e 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -1658,7 +1658,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);
}