diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-05-01 15:41:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-01 15:41:32 +0200 |
| commit | 57a5969c2672b36160fea1b7c38c424de562a57b (patch) | |
| tree | ee52f8ddaa8d37297142e59029df461d3000ce31 /src/server/game/Handlers/PetHandler.cpp | |
| parent | fbd74eb5d8b5aa3a6874ee99044054e097b5ef21 (diff) | |
| parent | 05ba662d5daaa3428cc01cdaa3794bf5a073ef17 (diff) | |
Merge pull request #24500 from funjoker/cherry-picks
Diffstat (limited to 'src/server/game/Handlers/PetHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/PetHandler.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index 8dc2523afcc..73bc95f2caf 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -331,13 +331,15 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe { if (unit_target) { - pet->SetInFront(unit_target); + if (!pet->IsFocusing()) + pet->SetInFront(unit_target); if (Player* player = unit_target->ToPlayer()) pet->SendUpdateToPlayer(player); } else if (Unit* unit_target2 = spell->m_targets.GetUnitTarget()) { - pet->SetInFront(unit_target2); + if (!pet->IsFocusing()) + pet->SetInFront(unit_target2); if (Player* player = unit_target2->ToPlayer()) pet->SendUpdateToPlayer(player); } |