From 5d4dcba0de0d764ae9bf81071171ef41e377b063 Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Sat, 3 Jan 2009 21:24:19 -0600
Subject: *Update pet's speed when pet is incombat rather than when owner is in
 combat.

--HG--
branch : trunk
---
 src/game/PetAI.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/game/PetAI.cpp')

diff --git a/src/game/PetAI.cpp b/src/game/PetAI.cpp
index 6a87d52cfca..82259cbba4d 100644
--- a/src/game/PetAI.cpp
+++ b/src/game/PetAI.cpp
@@ -73,6 +73,9 @@ void PetAI::AttackStart(Unit *u)
 
     if(i_pet.Attack(u,true))
     {
+        i_pet.SetInCombatWith(u);
+        u->SetInCombatWith(&i_pet);
+
         i_pet.clearUnitState(UNIT_STAT_FOLLOW);
         // TMGs call CreatureRelocation which via MoveInLineOfSight can call this function
         // thus with the following clear the original TMG gets invalidated and crash, doh
-- 
cgit v1.2.3