diff options
| author | Blaymoira <none@none> | 2009-03-06 20:14:07 +0100 |
|---|---|---|
| committer | Blaymoira <none@none> | 2009-03-06 20:14:07 +0100 |
| commit | b49732c04db0d5bf67bf78e73e9c22f2078fd47c (patch) | |
| tree | e445fa32d805789d966505ffac97535152e852f6 /src/game/PetHandler.cpp | |
| parent | ba05670747d7f5cc91ce4e623f2b89ba60e8081e (diff) | |
| parent | 0b9d3f95de06da9e23bdd075a286679395dab49c (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 05c889b8cf9..19b05797618 100644 --- a/src/game/PetHandler.cpp +++ b/src/game/PetHandler.cpp @@ -120,7 +120,7 @@ void WorldSession::HandlePetAction( WorldPacket & recv_data ) if(pet->GetTypeId() != TYPEID_PLAYER) { - if (((Creature*)pet)->AI()) + if (((Creature*)pet)->IsAIEnabled) ((Creature*)pet)->AI()->AttackStart(TargetUnit); //10% chance to play special pet attack talk, else growl @@ -165,7 +165,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; @@ -241,7 +242,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); } |