Comanion: fix combat assist

Author: Xenphis

src/server/game/AI/Companion/CompanionAI.cpp

@@ -34,7 +34,7 @@ namespace
 
 CompanionAI::CompanionAI(Creature* creature) : CreatureAI(creature), _checkTimer(0)
 {
-    creature->SetReactState(REACT_PASSIVE);
+    creature->SetReactState(REACT_DEFENSIVE);
 }
 
 void CompanionAI::JustAppeared()
@@ -68,6 +68,7 @@ void CompanionAI::StartFollowing(Player* player)
 
 void CompanionAI::StopFollowing()
 {
+    me->SetReactState(REACT_DEFENSIVE);   // reset posture for the next recruiter
     NotifyDismissed();
     me->GetMotionMaster()->Clear();
     me->GetMotionMaster()->MoveTargetedHome();
@@ -78,15 +79,8 @@ void CompanionAI::UpdateAI(uint32 diff)
     if (!IsRecruited())
         return;
 
-    if (_checkTimer > diff)
-    {
-        _checkTimer -= diff;
-        return;
-    }
-    _checkTimer = COMPANION_CHECK_INTERVAL;
-
-    // Map-local lookup: fails when the owner logged out or changed map,
-    // in which case the companion dismisses itself and walks home.
+    // Resolved every tick now (cheap map-local lookup, same as PetAI does for real pets)
+    // so combat below is responsive and owner-gone detection isn't up to 1s late.
     Player* owner = ObjectAccessor::GetPlayer(*me, _ownerGuid);
     if (!owner)
     {
@@ -97,13 +91,55 @@ void CompanionAI::UpdateAI(uint32 diff)
     if (!me->IsAlive())
         return;
 
+    if (me->IsEngaged())
+    {
+        if (UpdateVictim())
+            DoMeleeAttackIfReady();
+    }
+    else if (!me->HasReactState(REACT_PASSIVE) && owner->IsAlive())
+    {
+        if (Unit* target = SelectAssistTarget(owner))
+            AttackStart(target);
+    }
+
+    if (_checkTimer > diff)
+    {
+        _checkTimer -= diff;
+        return;
+    }
+    _checkTimer = COMPANION_CHECK_INTERVAL;
+
     if (!me->IsWithinDist(owner, COMPANION_TELEPORT_DIST))
         me->NearTeleportTo(owner->GetPositionX(), owner->GetPositionY(), owner->GetPositionZ(), owner->GetOrientation());
 
-    if (me->GetMotionMaster()->GetCurrentMovementGeneratorType() != FOLLOW_MOTION_TYPE)
+    me->SetHomePosition(owner->GetPosition());
+
+    if (!me->IsEngaged() && me->GetMotionMaster()->GetCurrentMovementGeneratorType() != FOLLOW_MOTION_TYPE)
         StartFollowing(owner);
 }
 
+void CompanionAI::EnterEvadeMode(EvadeReason why)
+{
+    if (!_EnterEvadeMode(why))
+        return;
+
+    if (Player* owner = ObjectAccessor::GetPlayer(*me, _ownerGuid))
+        StartFollowing(owner);
+    else
+        me->GetMotionMaster()->MoveTargetedHome();
+
+    Reset();
+}
+
+Unit* CompanionAI::SelectAssistTarget(Player* owner) const
+{
+    Unit* target = owner->getAttackerForHelper();
+    if (!target)
+        target = owner->GetVictim();
+
+    return me->CanCreatureAttack(target) ? target : nullptr;
+}
+
 bool CompanionAI::OnGossipHello(Player* player)
 {
     if (!sCompanionMgr->IsCompanion(me->GetEntry()))

src/server/game/AI/Companion/CompanionAI.h

@@ -30,8 +30,7 @@ class TC_GAME_API CompanionAI : public CreatureAI
         static int32 Permissible(Creature const* /*creature*/) { return PERMIT_BASE_NO; }
 
         void UpdateAI(uint32 diff) override;
-        void AttackStart(Unit* /*victim*/) override { }
-        void MoveInLineOfSight(Unit* /*who*/) override { }
+        void EnterEvadeMode(EvadeReason why) override;
         void JustAppeared() override;
         void JustDied(Unit* /*killer*/) override;
 
@@ -45,6 +44,7 @@ class TC_GAME_API CompanionAI : public CreatureAI
 
     private:
         void NotifyDismissed();
+        Unit* SelectAssistTarget(Player* owner) const;
 
         ObjectGuid _ownerGuid;
         uint32 _checkTimer;