diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index 245c3af5a..280214a02 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -1182,11 +1182,7 @@ void WorldObject::SetMap(Map* map) m_currMap = map; m_mapId = map->GetId(); m_InstanceId = map->GetInstanceId(); -#ifdef ELUNA - if (Eluna* e = map->GetEluna()) - if (!elunaEvents) - elunaEvents = new ElunaEventProcessor(e->eventMgr.get(), this); -#endif + if (IsStoredInWorldObjectGridContainer()) m_currMap->AddWorldObject(this); }