diff options
| author | megamage <none@none> | 2009-03-06 19:52:46 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-06 19:52:46 -0600 |
| commit | f6ca5c601ef6089220fb0bfe3bc155fbbf3de812 (patch) | |
| tree | b9598e93d132aea806527aa4de13046e3c80dc5d /src/game/PetHandler.cpp | |
| parent | dbb8c78394660c277f9056d899df8b0f9f1f8cb0 (diff) | |
| parent | 4f6c96b98c5d5a065f902aa6106c928bf0b2a668 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/game/PetHandler.cpp')
| -rw-r--r-- | src/game/PetHandler.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp index 17c2ba4275b..45fcbbb3219 100644 --- a/src/game/PetHandler.cpp +++ b/src/game/PetHandler.cpp @@ -127,7 +127,7 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data ) if(pet->GetTypeId() != TYPEID_PLAYER) { pet->GetMotionMaster()->Clear(); - if (((Creature*)pet)->AI()) + if (((Creature*)pet)->IsAIEnabled) ((Creature*)pet)->AI()->AttackStart(TargetUnit); //10% chance to play special pet attack talk, else growl @@ -173,7 +173,8 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data ) case REACT_PASSIVE: //passive case REACT_DEFENSIVE: //recovery case REACT_AGGRESSIVE: //activete - charmInfo->SetReactState( ReactStates(spellid) ); + if(pet->GetTypeId() == TYPEID_UNIT) + ((Creature*)pet)->SetReactState( ReactStates(spellid) ); break; } break; @@ -249,7 +250,7 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data ) if (pet->getVictim()) pet->AttackStop(); pet->GetMotionMaster()->Clear(); - if (((Creature*)pet)->AI()) + if (((Creature*)pet)->IsAIEnabled) ((Creature*)pet)->AI()->AttackStart(unit_target); } } |