Cleanup creatures after each round.

AnchyDev · Nov 3, 2023 · 881dffd · 881dffd
1 parent bf1cc4b
commit 881dffd
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/scripts/ToSInstanceScript.cpp b/src/scripts/ToSInstanceScript.cpp
@@ -622,6 +622,7 @@ void ToSInstanceScript::CheckWaveCompletion()
     {
         NotifyPlayers();
         PopulateRewardChest();
+        CleanupCreatures();
 
         if (sConfigMgr->GetOption<bool>("TrialOfStrength.ResetCooldowns", true))
         {
@@ -877,7 +878,9 @@ void ToSInstanceScript::CleanupCreatures()
     {
         auto creature = *it;
 
-        if (!creature || !creature->IsInWorld())
+        if (!creature ||
+            !creature->IsInWorld() ||
+            creature->GetMapId() != TOS_MAP_ID)
         {
             continue;
         }