diff options
| author | megamage <none@none> | 2009-01-04 16:17:46 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-01-04 16:17:46 -0600 |
| commit | eb5a7b02eef6fe13684dfe14faf048bbce1d0f83 (patch) | |
| tree | 395bd3da004c0628956d64335ee0e2c404d4f772 /src/game/PetAI.cpp | |
| parent | 820e0214faf4645ef1bc411aa5cc581392db62db (diff) | |
| parent | 15d25f45ae920a4418f3fcb1e6828c923a3aedc1 (diff) | |
*Merge with Trinity 783.
--HG--
branch : trunk
Diffstat (limited to 'src/game/PetAI.cpp')
| -rw-r--r-- | src/game/PetAI.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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 |