diff options
| author | UltraNix <80540499+UltraNix@users.noreply.github.com> | 2021-10-11 21:19:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 16:19:56 -0300 |
| commit | bc451d2ecae59fd829f15f51b970444b73c0f368 (patch) | |
| tree | ee89e2b1469b0db14a0ed84174a76552f4bae7ad | |
| parent | 1138d837a1ac0914197aa1c4cf456f03f3f03fe6 (diff) | |
fix(Core/Pets): Disable /petfollow command while using vehicle. (#8304)
Fixes #8156
| -rw-r--r-- | src/server/game/Handlers/PetHandler.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index b36da6a696..ade5a27e88 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -442,6 +442,12 @@ void WorldSession::HandlePetAction(WorldPacket& recvData) if (pet->GetTypeId() == TYPEID_PLAYER && flag != ACT_COMMAND && flag != ACT_REACTION) return; + // Do not follow itself vehicle + if (spellid == COMMAND_FOLLOW && _player->IsOnVehicle(pet)) + { + return; + } + if (GetPlayer()->m_Controlled.size() == 1) HandlePetActionHelper(pet, guid1, spellid, flag, guid2); else |