SpawnGroup: Add cyclic graph trigger protection to spawn group aggro …

…trigger
cmangos · Oct 29, 2024 · a934080 · a934080
1 parent 946016a
commit a934080
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/game/Maps/SpawnGroup.cpp b/src/game/Maps/SpawnGroup.cpp
@@ -423,6 +423,11 @@ void CreatureGroup::TriggerLinkingEvent(uint32 event, Unit* target)
             if (!target->HasCharmer() && m_objects.find(target->GetDbGuid()) != m_objects.end())
                 return;
 
+            if (m_linkageTargets.find(target) != m_linkageTargets.end()) // already triggering for target
+                return;
+
+            m_linkageTargets.insert(target);
+
             for (auto& data : m_objects)
             {
                 uint32 dbGuid = data.first;
@@ -441,6 +446,8 @@ void CreatureGroup::TriggerLinkingEvent(uint32 event, Unit* target)
                 CreatureGroup* group = static_cast<CreatureGroup*>(m_map.GetSpawnManager().GetSpawnGroup(linkedGroup));
                 group->TriggerLinkingEvent(event, target);
             }
+
+            m_linkageTargets.erase(target);
             break;
         case CREATURE_GROUP_EVENT_EVADE:
             if ((m_entry.Flags & CREATURE_GROUP_EVADE_TOGETHER) != 0)

diff --git a/src/game/Maps/SpawnGroup.h b/src/game/Maps/SpawnGroup.h
@@ -100,6 +100,7 @@ class CreatureGroup : public SpawnGroup
     private:
         void ClearRespawnTimes();
         FormationDataSPtr m_formationData;
+        std::set<Unit*> m_linkageTargets;
 };
 
 struct RespawnPosition