From dfc5ebbbab5e6093d16c914eafbd47c95e92e2bb Mon Sep 17 00:00:00 2001 From: blinkysc <37940565+blinkysc@users.noreply.github.com> Date: Fri, 6 Feb 2026 16:18:59 -0600 Subject: [PATCH] fix(Core/Handlers): Handle vehicle and possess spells in CMSG_REQUEST_PET_INFO (#24575) Co-authored-by: blinkysc Co-authored-by: Faq --- src/server/game/Handlers/MiscHandler.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index c6485d813..c8af95af2 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -1560,8 +1560,15 @@ void WorldSession::HandleRequestPetInfo(WorldPackets::Pet::RequestPetInfo& /*pac if (_player->GetPet()) _player->PetSpellInitialize(); - else if (_player->GetCharm()) - _player->CharmSpellInitialize(); + else if (Unit* charm = _player->GetCharm()) + { + if (charm->HasUnitState(UNIT_STATE_POSSESSED)) + _player->PossessSpellInitialize(); + else if (charm->HasUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED) && charm->HasUnitFlag(UNIT_FLAG_POSSESSED)) + _player->VehicleSpellInitialize(); + else + _player->CharmSpellInitialize(); + } } void WorldSession::HandleSetTaxiBenchmarkOpcode(WorldPacket& recv_data)