From d57e74b3b592536ffd32a92a342eb0abc6e05e62 Mon Sep 17 00:00:00 2001 From: Treeston Date: Wed, 29 Aug 2018 13:55:49 +0200 Subject: Core/Scripting: Delay zone script's OnCreatureCreate until the creature has been added to map stores (cherry picked from commit b4a1887c4d8df5a7729ed5c4126f6a7655a02127) --- src/server/game/Entities/Creature/Creature.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index e4895dd5952..19cc3aab8b3 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -323,9 +323,6 @@ void Creature::AddToWorld() ///- Register the creature for guid lookup if (!IsInWorld()) { - if (GetZoneScript()) - GetZoneScript()->OnCreatureCreate(this); - GetMap()->GetObjectsStore().Insert(GetGUID(), this); if (m_spawnId) GetMap()->GetCreatureBySpawnIdStore().insert(std::make_pair(m_spawnId, this)); @@ -335,6 +332,9 @@ void Creature::AddToWorld() AIM_Initialize(); if (IsVehicle()) GetVehicleKit()->Install(); + + if (GetZoneScript()) + GetZoneScript()->OnCreatureCreate(this); } } -- cgit v1.2.3