diff options
| author | megamage <none@none> | 2009-03-12 14:22:59 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-12 14:22:59 -0600 |
| commit | 16ee4a46c271bd7c234ffa7579f5f90cf2007772 (patch) | |
| tree | 6d547d8228472fcc97ead5dfcdd8a9aaf8f70233 /src/game/PetHandler.cpp | |
| parent | 6e12d3f1b9f40f3f95390245f3fcbb30fbd8657f (diff) | |
| parent | 1fbfc6da645058a6da3073dafde0e6bca621e31c (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/PetHandler.cpp')
| -rw-r--r-- | src/game/PetHandler.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp index 2cc049ebd84..f158f3a8fcc 100644 --- a/src/game/PetHandler.cpp +++ b/src/game/PetHandler.cpp @@ -82,13 +82,15 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data ) switch(spellid) { case COMMAND_STAY: //flat=1792 //STAY + pet->AttackStop(); + pet->InterruptNonMeleeSpells(false); pet->StopMoving(); - pet->GetMotionMaster()->Clear(); pet->GetMotionMaster()->MoveIdle(); charmInfo->SetCommandState( COMMAND_STAY ); break; case COMMAND_FOLLOW: //spellid=1792 //FOLLOW pet->AttackStop(); + pet->InterruptNonMeleeSpells(false); pet->GetMotionMaster()->MoveFollow(_player,PET_FOLLOW_DIST,PET_FOLLOW_ANGLE); charmInfo->SetCommandState( COMMAND_FOLLOW ); break; |