diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-12-16 16:56:18 -0800 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-12-16 16:56:18 -0800 |
| commit | 815742f44d6db09ea6ba63f92e5fe3fd01f8b0e5 (patch) | |
| tree | 618387b8642fe1181d557a66b3c54127c3c23eb7 | |
| parent | 9776bdfdfac50f0d56059bca3700364cfc7eea71 (diff) | |
| parent | d39b21df8ad136ab97e7e11f13f131dfd2d78b2d (diff) | |
Merge pull request #8681 from xomachine/master
Core/PetAI: Emote and autocast fixes
| -rw-r--r-- | src/server/game/AI/CoreAI/PetAI.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp index b7fa3940a20..9b0123ed824 100644 --- a/src/server/game/AI/CoreAI/PetAI.cpp +++ b/src/server/game/AI/CoreAI/PetAI.cpp @@ -182,7 +182,8 @@ void PetAI::UpdateAI(const uint32 diff) spellUsed = true; } } - + if (spellInfo->HasEffect(SPELL_EFFECT_JUMP_DEST)) + continue; //pets must jump only to target // No enemy, check friendly if (!spellUsed) { @@ -578,11 +579,19 @@ void PetAI::ReceiveEmote(Player* player, uint32 emote) { case TEXT_EMOTE_COWER: if (me->isPet() && me->ToPet()->IsPetGhoul()) - me->HandleEmoteCommand(EMOTE_ONESHOT_ROAR); + me->HandleEmoteCommand(/*EMOTE_ONESHOT_ROAR*/EMOTE_ONESHOT_OMNICAST_GHOUL); break; case TEXT_EMOTE_ANGRY: if (me->isPet() && me->ToPet()->IsPetGhoul()) - me->HandleEmoteCommand(EMOTE_ONESHOT_COWER); + me->HandleEmoteCommand(/*EMOTE_ONESHOT_COWER*/EMOTE_STATE_STUN); + break; + case TEXT_EMOTE_GLARE: + if (me->isPet() && me->ToPet()->IsPetGhoul()) + me->HandleEmoteCommand(EMOTE_STATE_STUN); + break; + case TEXT_EMOTE_SOOTHE: + if (me->isPet() && me->ToPet()->IsPetGhoul()) + me->HandleEmoteCommand(EMOTE_ONESHOT_OMNICAST_GHOUL); break; } } |