Merge pull request #455 from ElunaLuaEngine/multistate

Multistate implementation
ElunaLuaEngine · Jan 26, 2024 · b6838d5 · b6838d5
2 parents 7fc7e01 + dc9e571
commit b6838d5
Show file tree

Hide file tree

Showing 68 changed files with 7,568 additions and 6,673 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,6 +16,7 @@ jobs:
       with:
         submodules: false
         repository: ElunaLuaEngine/ElunaTrinityWotlk
+        ref: multistate
     - uses: actions/checkout@v3
       with:
         path: src/server/game/LuaEngine

diff --git a/BattleGroundHooks.cpp b/BattleGroundHooks.cpp
@@ -17,15 +17,14 @@ using namespace Hooks;
         return;\
     auto key = EventKey<BGEvents>(EVENT);\
     if (!BGEventBindings->HasBindingsFor(key))\
-        return;\
-    LOCK_ELUNA
+        return;
 
 void Eluna::OnBGStart(BattleGround* bg, BattleGroundTypeId bgId, uint32 instanceId)
 {
     START_HOOK(BG_EVENT_ON_START);
-    Push(bg);
-    Push(bgId);
-    Push(instanceId);
+    HookPush(bg);
+    HookPush(bgId);
+    HookPush(instanceId);
     CallAllFunctions(BGEventBindings, key);
 }
 
@@ -36,27 +35,27 @@ void Eluna::OnBGEnd(BattleGround* bg, BattleGroundTypeId bgId, uint32 instanceId
 #endif
 {
     START_HOOK(BG_EVENT_ON_END);
-    Push(bg);
-    Push(bgId);
-    Push(instanceId);
-    Push(winner);
+    HookPush(bg);
+    HookPush(bgId);
+    HookPush(instanceId);
+    HookPush(winner);
     CallAllFunctions(BGEventBindings, key);
 }
 
 void Eluna::OnBGCreate(BattleGround* bg, BattleGroundTypeId bgId, uint32 instanceId)
 {
     START_HOOK(BG_EVENT_ON_CREATE);
-    Push(bg);
-    Push(bgId);
-    Push(instanceId);
+    HookPush(bg);
+    HookPush(bgId);
+    HookPush(instanceId);
     CallAllFunctions(BGEventBindings, key);
 }
 
 void Eluna::OnBGDestroy(BattleGround* bg, BattleGroundTypeId bgId, uint32 instanceId)
 {
     START_HOOK(BG_EVENT_ON_PRE_DESTROY);
-    Push(bg);
-    Push(bgId);
-    Push(instanceId);
+    HookPush(bg);
+    HookPush(bgId);
+    HookPush(instanceId);
     CallAllFunctions(BGEventBindings, key);
 }
diff --git a/BindingMap.h b/BindingMap.h
@@ -23,7 +23,7 @@ extern "C"
  * A set of bindings from keys of type `K` to Lua references.
  */
 template<typename K>
-class BindingMap : public ElunaUtil::Lockable
+class BindingMap
 {
 private:
     lua_State* L;
@@ -78,8 +78,6 @@ class BindingMap : public ElunaUtil::Lockable
      */
     uint64 Insert(const K& key, int ref, uint32 shots)
     {
-        Guard guard(GetLock());
-
         uint64 id = (++maxBindingID);
         BindingList& list = bindings[key];
         list.push_back(std::unique_ptr<Binding>(new Binding(L, id, ref, shots)));
@@ -92,8 +90,6 @@ class BindingMap : public ElunaUtil::Lockable
      */
     void Clear(const K& key)
     {
-        Guard guard(GetLock());
-
         if (bindings.empty())
             return;
 
@@ -118,8 +114,6 @@ class BindingMap : public ElunaUtil::Lockable
      */
     void Clear()
     {
-        Guard guard(GetLock());
-
         if (bindings.empty())
             return;
 
@@ -134,8 +128,6 @@ class BindingMap : public ElunaUtil::Lockable
      */
     void Remove(uint64 id)
     {
-        Guard guard(GetLock());
-
         auto iter = id_lookup_table.find(id);
         if (iter == id_lookup_table.end())
             return;
@@ -163,8 +155,6 @@ class BindingMap : public ElunaUtil::Lockable
      */
     bool HasBindingsFor(const K& key)
     {
-        Guard guard(GetLock());
-
         if (bindings.empty())
             return false;
 
@@ -181,8 +171,6 @@ class BindingMap : public ElunaUtil::Lockable
      */
     void PushRefsFor(const K& key)
     {
-        Guard guard(GetLock());
-
         if (bindings.empty())
             return;