From bc451d2ecae59fd829f15f51b970444b73c0f368 Mon Sep 17 00:00:00 2001
From: UltraNix <80540499+UltraNix@users.noreply.github.com>
Date: Mon, 11 Oct 2021 21:19:56 +0200
Subject: [PATCH] fix(Core/Pets): Disable /petfollow command while using
 vehicle. (#8304)

Fixes #8156
---
 src/server/game/Handlers/PetHandler.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp
index b36da6a69..ade5a27e8 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