diff --git a/Source/Game/Entities/AreaTrigger/AreaTrigger.cs b/Source/Game/Entities/AreaTrigger/AreaTrigger.cs index c1cb2e27d..57ebdd631 100644 --- a/Source/Game/Entities/AreaTrigger/AreaTrigger.cs +++ b/Source/Game/Entities/AreaTrigger/AreaTrigger.cs @@ -797,7 +797,12 @@ namespace Game.Entities public uint GetScriptId() { if (_spawnId != 0) - return Global.AreaTriggerDataStorage.GetAreaTriggerSpawn(_spawnId).ScriptId; + { + AreaTriggerSpawn spawn = Global.AreaTriggerDataStorage.GetAreaTriggerSpawn(_spawnId); + if (spawn != null && spawn.ScriptId != 0) + return spawn.ScriptId; + + } AreaTriggerCreateProperties createProperties = GetCreateProperties(); if (createProperties != null)