Add RegisterEvent support to World State

Author: Foereaper

src/server/game/Entities/GameObject/GameObject.cpp

@@ -475,8 +475,11 @@ void GameObject::Update(uint32 diff)
     {
         e->UpdateAI(this, diff);
 
-        if (elunaEvents) // can be null on maps without eluna
-            elunaEvents->Update(diff);
+        if (elunaMapEvents) // can be null on maps without eluna
+            elunaMapEvents->Update(diff);
+
+        if (elunaWorldEvents)
+            elunaWorldEvents->Update(diff);
     }
 #endif
     m_Events.Update(diff);

src/server/game/Entities/Object/Object.cpp

@@ -1825,13 +1825,24 @@ 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 = std::make_unique<ElunaEventProcessor>(e, this);
+    // in multistate mode, always reset Map events, then recreate the Map events procesor
+    if (!sElunaConfig->IsElunaCompatibilityMode())
+    {
+        auto& events = GetElunaEvents(m_mapId);
+        if (events)
+            events.reset();
+
+        if (Eluna* e = map->GetEluna())
+            events = std::make_unique<ElunaEventProcessor>(e, this);
+    }
+
+    // create the World events processor
+    if (Eluna* e = sWorld->GetEluna())
+    {
+        auto& events = GetElunaEvents(-1);
+        if (!events)
+            events = std::make_unique<ElunaEventProcessor>(e, this);
+    }
 #endif
     if (IsStoredInWorldObjectGridContainer())
        m_currMap->AddWorldObject(this);

src/server/game/Entities/Object/Object.h

@@ -568,10 +568,13 @@ class TC_GAME_API WorldObject : public Object, public WorldLocation
         uint32  LastUsedScriptID;
 
 #ifdef ELUNA
-        std::unique_ptr <ElunaEventProcessor> elunaEvents;
+        std::unique_ptr <ElunaEventProcessor> elunaMapEvents;
+        std::unique_ptr <ElunaEventProcessor> elunaWorldEvents;
 
         Eluna* GetEluna() const;
 
+        std::unique_ptr<ElunaEventProcessor>& GetElunaEvents(int32 mapId) { return (mapId == -1) ? elunaWorldEvents : elunaMapEvents; }
+
         LuaVal lua_data = LuaVal({});
 #endif
 

src/server/game/Entities/Unit/Unit.cpp

@@ -438,8 +438,11 @@ Unit::~Unit()
 void Unit::Update(uint32 p_time)
 {
 #ifdef ELUNA
-    if(elunaEvents) // can be null on maps without eluna
-        elunaEvents->Update(p_time);
+    if(elunaMapEvents) // can be null on maps without eluna
+        elunaMapEvents->Update(p_time);
+
+    if (elunaWorldEvents) // can be null on maps without eluna
+        elunaWorldEvents->Update(p_time);
 #endif
 
     // WARNING! Order of execution here is important, do not change.