Creature: Reimplement sentry totem behaviour as CreatureStaticFlags::…

…COMBAT_PING
cmangos · Dec 27, 2024 · 892e7df · 892e7df
1 parent cda5f88
commit 892e7df
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/src/game/AI/BaseAI/CreatureAI.cpp b/src/game/AI/BaseAI/CreatureAI.cpp
@@ -73,6 +73,18 @@ void CreatureAI::EnterCombat(Unit* enemy)
 
 void CreatureAI::AttackStart(Unit* who)
 {
+    if (m_creature->GetSettings().HasFlag(CreatureStaticFlags::COMBAT_PING))
+    {
+        if (Player* owner = dynamic_cast<Player*>(m_creature->GetSpawner()))
+        {
+            WorldPacket data(MSG_MINIMAP_PING, (8 + 4 + 4));
+            data << m_creature->GetObjectGuid();
+            data << m_creature->GetPositionX();
+            data << m_creature->GetPositionY();
+            owner->SendDirectMessage(data);
+        }
+    }
+
     if (!who || HasReactState(REACT_PASSIVE))
         return;
 

diff --git a/src/game/AI/BaseAI/TotemAI.h b/src/game/AI/BaseAI/TotemAI.h
@@ -34,7 +34,6 @@ class TotemAI : public CreatureEventAI
 
         void SpellHit(Unit* unit, const SpellEntry* spellInfo) override;
         void MoveInLineOfSight(Unit* who) override;
-        void AttackStart(Unit* who) override;
         void EnterEvadeMode() override;
         bool IsVisible(Unit* who) const override;
 

diff --git a/src/game/Spells/Scripts/Scripting/ClassScripts/Shaman.cpp b/src/game/Spells/Scripts/Scripting/ClassScripts/Shaman.cpp
@@ -56,20 +56,6 @@ struct SentryTotemAI : public TotemAI
 {
     using TotemAI::TotemAI;
 
-    void AttackStart(Unit* who) override
-    {
-        TotemAI::AttackStart(who);
-        // Sentry totem sends ping on attack
-        if (Player* owner = dynamic_cast<Player*>(m_creature->GetSpawner()))
-        {
-            WorldPacket data(MSG_MINIMAP_PING, (8 + 4 + 4));
-            data << m_creature->GetObjectGuid();
-            data << m_creature->GetPositionX();
-            data << m_creature->GetPositionY();
-            owner->SendDirectMessage(data);
-        }
-    }
-
     void RemoveAura()
     {
         if (Unit* spawner = m_creature->GetSpawner())