From dad2f6c5a5629395d4c079927094c991a89498eb Mon Sep 17 00:00:00 2001 From: hondacrx Date: Tue, 2 Nov 2021 14:22:09 -0400 Subject: [PATCH] Core/Scripting: Delay zone script's OnCreatureCreate until the creature has been added to map stores Port From (https://github.com/TrinityCore/TrinityCore/commit/d57e74b3b592536ffd32a92a342eb0abc6e05e62) --- Source/Game/Entities/Creature/Creature.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/Game/Entities/Creature/Creature.cs b/Source/Game/Entities/Creature/Creature.cs index d792ee4f2..a09c3da7f 100644 --- a/Source/Game/Entities/Creature/Creature.cs +++ b/Source/Game/Entities/Creature/Creature.cs @@ -63,9 +63,6 @@ namespace Game.Entities // Register the creature for guid lookup if (!IsInWorld) { - if (m_zoneScript != null) - m_zoneScript.OnCreatureCreate(this); - GetMap().GetObjectsStore().Add(GetGUID(), this); if (m_spawnId != 0) GetMap().GetCreatureBySpawnIdStore().Add(m_spawnId, this); @@ -75,6 +72,9 @@ namespace Game.Entities InitializeAI(); if (IsVehicle()) GetVehicleKit().Install(); + + if (m_zoneScript != null) + m_zoneScript.OnCreatureCreate(this); } }