From aef568cdd17dd249c88af1ccf1790f7a9909f07e Mon Sep 17 00:00:00 2001
From: treeston <treeston.mmoc@gmail.com>
Date: Wed, 31 May 2017 14:03:48 +0200
Subject: [PATCH] Fix an issue where CanSpawn would never get invoked on
 creatures without per-guid script.

---
 src/server/game/Scripting/ScriptMgr.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index 749417228cf..f3c9b4fcd45 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -1641,7 +1641,10 @@ bool ScriptMgr::CanSpawn(ObjectGuid::LowType spawnId, uint32 entry, CreatureTemp
     CreatureTemplate const* baseTemplate = sObjectMgr->GetCreatureTemplate(entry);
     if (!baseTemplate)
         baseTemplate = actTemplate;
-    GET_SCRIPT_RET(CreatureScript, (cData ? cData->ScriptId : baseTemplate->ScriptID), tmpscript, true);
+    uint32 scriptId = baseTemplate->ScriptID;
+    if (cData && cData->ScriptId)
+        scriptId = cData->ScriptId;
+    GET_SCRIPT_RET(CreatureScript, scriptId, tmpscript, true);
     return tmpscript->CanSpawn(spawnId, entry, baseTemplate, actTemplate, cData, map);
 }