aboutsummaryrefslogtreecommitdiff
path: root/src/game/PetAI.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-01-16 22:59:24 -0600
committermegamage <none@none>2009-01-16 22:59:24 -0600
commitfa2e6622ad9dca5051b451e14ea303670ec65fa6 (patch)
tree585a7216408a60c43037244c96b2be7bceffa568 /src/game/PetAI.cpp
parent11239e9f5f9bf63e1ec07bb348b054accebd5b56 (diff)
parent0a1c601a1cc0e0036ad8fbfce68d87d14fa572d0 (diff)
*Merge.
--HG-- branch : trunk
Diffstat (limited to 'src/game/PetAI.cpp')
-rw-r--r--src/game/PetAI.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/game/PetAI.cpp b/src/game/PetAI.cpp
index 82259cbba4d..abb62ade7da 100644
--- a/src/game/PetAI.cpp
+++ b/src/game/PetAI.cpp
@@ -74,7 +74,6 @@ 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