Instance: Fix ::AddInstanceEvent only going off once

cmangos · May 5, 2024 · 4e63cd1 · 4e63cd1
1 parent a90d257
commit 4e63cd1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/game/AI/ScriptDevAI/scripts/outland/hellfire_citadel/shattered_halls/shattered_halls.cpp b/src/game/AI/ScriptDevAI/scripts/outland/hellfire_citadel/shattered_halls/shattered_halls.cpp
@@ -550,7 +550,7 @@ void instance_shattered_halls::Update(uint32 diff)
 
 void instance_shattered_halls::AddInstanceEvent(uint32 id, std::function<bool(Unit const*)> check, std::function<void()> successEvent)
 {
-    AddCustomAction(id, false, [instance = this->instance, check = check, successEvent = successEvent]()
+    AddCustomAction(id, false, [instance = this->instance, check = check, successEvent = successEvent, id, this]()
     {
         for (const auto& data : instance->GetPlayers())
         {
@@ -560,6 +560,7 @@ void instance_shattered_halls::AddInstanceEvent(uint32 id, std::function<bool(Un
                 return;
             }
         }
+        ResetTimer(id, 1000);
     });
 }
 

diff --git a/src/game/AI/ScriptDevAI/scripts/outland/tempest_keep/botanica/botanica.cpp b/src/game/AI/ScriptDevAI/scripts/outland/tempest_keep/botanica/botanica.cpp
@@ -37,7 +37,7 @@ instance_botanica::instance_botanica(Map* map) : ScriptedInstance(map)
 
 void instance_botanica::AddInstanceEvent(uint32 id, std::function<bool(Unit const*)> check, std::function<void()> successEvent)
 {
-    AddCustomAction(id, false, [instance = this->instance, check = check, successEvent = successEvent]()
+    AddCustomAction(id, false, [instance = this->instance, check = check, successEvent = successEvent, id, this]()
     {
         for (const auto& data : instance->GetPlayers())
         {
@@ -47,6 +47,7 @@ void instance_botanica::AddInstanceEvent(uint32 id, std::function<bool(Unit cons
                 return;
             }
         }
+        ResetTimer(id, 1000);
     });
 }