From ea2004af89a6cbb7fa63eaf3a9fae8639c29ad1d Mon Sep 17 00:00:00 2001 From: hondacrx Date: Mon, 5 Feb 2024 13:09:02 -0500 Subject: [PATCH] Core/AreaTrigger: Fallback to CreateProperties script, if ScriptName of static areatrigger is not provided Port From (https://github.com/TrinityCore/TrinityCore/commit/7e061adffa20323a26c0a489ba70dd098689f6d7) --- Source/Game/Entities/AreaTrigger/AreaTrigger.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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)