Creature: Add function to CallAssistance explicitly

cmangos · Oct 6, 2024 · 74d69d4 · 74d69d4
1 parent f5c57fb
commit 74d69d4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/game/Entities/Creature.cpp b/src/game/Entities/Creature.cpp
@@ -2174,9 +2174,14 @@ bool Creature::IsVisibleInGridForPlayer(Player* pl) const
 }
 
 void Creature::CallAssistance()
+{
+    CallAssistance(GetVictim());
+}
+
+void Creature::CallAssistance(Unit* enemy)
 {
     // FIXME: should player pets call for assistance?
-    if (!m_AlreadyCallAssistance && GetVictim() && !HasCharmer())
+    if (!m_AlreadyCallAssistance && enemy && !HasCharmer())
     {
         MANGOS_ASSERT(AI());
 
@@ -2188,7 +2193,7 @@ void Creature::CallAssistance()
         float radius = sWorld.getConfig(CONFIG_FLOAT_CREATURE_FAMILY_ASSISTANCE_RADIUS);
         if (GetCreatureInfo()->CallForHelp > 0)
             radius = GetCreatureInfo()->CallForHelp;
-        AI()->SendAIEventAround(AI_EVENT_CALL_ASSISTANCE, GetVictim(), sWorld.getConfig(CONFIG_UINT32_CREATURE_FAMILY_ASSISTANCE_DELAY), radius);
+        AI()->SendAIEventAround(AI_EVENT_CALL_ASSISTANCE, enemy, sWorld.getConfig(CONFIG_UINT32_CREATURE_FAMILY_ASSISTANCE_DELAY), radius);
     }
 }
 

diff --git a/src/game/Entities/Creature.h b/src/game/Entities/Creature.h
@@ -740,6 +740,7 @@ class Creature : public Unit
 
         void CallForHelp(float radius);
         void CallAssistance();
+        void CallAssistance(Unit* enemy);
         void SetNoCallAssistance(bool val) { m_AlreadyCallAssistance = val; }
         bool CanAssistTo(const Unit* u, const Unit* enemy, bool checkfaction = true) const;
         bool CanInitiateAttack() const;

diff --git a/src/game/Entities/Unit.cpp b/src/game/Entities/Unit.cpp
@@ -9034,7 +9034,7 @@ void Unit::SetInCombatState(bool PvP, Unit* enemy)
         if (InstanceData* mapInstance = GetInstanceData())
             mapInstance->OnCreatureEnterCombat(creature);
 
-        creature->CallAssistance();
+        creature->CallAssistance(enemy);
 
         creature->SetCanCheckForHelp(false);
         creature->m_events.AddEvent(new UnitLambdaEvent(*creature, [](Unit& unit)