diff options
| author | megamage <none@none> | 2009-03-07 10:19:07 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-07 10:19:07 -0600 |
| commit | 814c6c2c3975bb9e04a8e64ff80888a33ad91963 (patch) | |
| tree | 18ae3799a0e858860e871f08e9785c2cb0ea2b4f /src/game/PetHandler.cpp | |
| parent | 318f173dd355951d08800d0bcf3b2e46b7d9884b (diff) | |
| parent | 6dc06ab53b2e5307b682c5723b3c6fd62318633e (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/PetHandler.cpp')
| -rw-r--r-- | src/game/PetHandler.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp index 45fcbbb3219..0a506c2fbcc 100644 --- a/src/game/PetHandler.cpp +++ b/src/game/PetHandler.cpp @@ -124,11 +124,9 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data ) if (pet->getVictim()) pet->AttackStop(); - if(pet->GetTypeId() != TYPEID_PLAYER) + if(pet->GetTypeId() != TYPEID_PLAYER && ((Creature*)pet)->IsAIEnabled) { - pet->GetMotionMaster()->Clear(); - if (((Creature*)pet)->IsAIEnabled) - ((Creature*)pet)->AI()->AttackStart(TargetUnit); + ((Creature*)pet)->AI()->AttackStart(TargetUnit); //10% chance to play special pet attack talk, else growl if(((Creature*)pet)->isPet() && ((Pet*)pet)->getPetType() == SUMMON_PET && pet != TargetUnit && urand(0, 100) < 10) |