Add Eluna event processor reset

Required in those cases where Eluna is not active on some maps for whatever reason
ElunaLuaEngine · Feb 25, 2025 · b4020fa · b4020fa
1 parent e58b802
commit b4020fa
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp
@@ -1825,8 +1825,12 @@ void WorldObject::SetMap(Map* map)
     m_mapId = map->GetId();
     m_InstanceId = map->GetInstanceId();
 #ifdef ELUNA
+    // in multistate mode, always reset in case Eluna is not active on the new map
+    if (elunaEvents && !sElunaConfig->IsElunaCompatibilityMode())
+        elunaEvents.reset();
+
     if (Eluna* e = map->GetEluna())
-        if (!elunaEvents || (elunaEvents && !sElunaConfig->IsElunaCompatibilityMode()))
+        if (!elunaEvents)
             elunaEvents = std::make_unique<ElunaEventProcessor>(e, this);
 #endif
     if (IsStoredInWorldObjectGridContainer())