Core/AreaTrigger: Fallback to CreateProperties script, if ScriptName of static areatrigger is not provided

1 files changed, 7 insertions, 1 deletions

diff --git a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp
index d99e005a76d..2f0d685fedf 100644
--- a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp
+++ b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp
@@ -833,7 +833,13 @@ AreaTriggerTemplate const* AreaTrigger::GetTemplate() const
 uint32 AreaTrigger::GetScriptId() const
 {
     if (_spawnId)
-        return ASSERT_NOTNULL(sAreaTriggerDataStore->GetAreaTriggerSpawn(_spawnId))->scriptId;
+    {
+        if (AreaTriggerSpawn const* spawn = ASSERT_NOTNULL(sAreaTriggerDataStore->GetAreaTriggerSpawn(_spawnId)))
+        {
+            if (spawn->scriptId)
+                return spawn->scriptId;
+        }
+    }
 
     if (AreaTriggerCreateProperties const* createProperties = GetCreateProperties())
         return createProperties->ScriptId;