Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/PacketIO: Handle CMSG_REQUEST_PET_INFO for more cases (#24364)

Browse Source 
+ vehicle
+ charm
+ possession

from 87c6cc19e5

(cherry picked from commit fbcd244b2f)
This commit is contained in:
NoName
2020-04-05 15:53:23 +03:00
committed by Shauren
parent a95c836b3b
commit 25e68fc5c2
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/server/game/Handlers/PetHandler.cpp
View File

@@ -764,5 +764,21 @@ void WorldSession::SendPetNameInvalid(uint32 error, const std::string& name, Dec
void WorldSession::HandleRequestPetInfo(WorldPackets::Pet::RequestPetInfo& /*requestPetInfo*/)
{
GetPlayer()->PetSpellInitialize();
// Handle the packet CMSG_REQUEST_PET_INFO - sent when player does ingame /reload command
// Packet sent when player has a pet
if (_player->GetPet())
_player->PetSpellInitialize();
else if (Unit* charm = _player->GetCharmed())
{
// Packet sent when player has a possessed unit
if (charm->HasUnitState(UNIT_STATE_POSSESSED))
_player->PossessSpellInitialize();
// Packet sent when player controlling a vehicle
else if (charm->HasUnitFlag(UNIT_FLAG_PLAYER_CONTROLLED) && charm->HasUnitFlag(UNIT_FLAG_POSSESSED))
_player->VehicleSpellInitialize();
// Packet sent when player has a charmed unit
else
_player->CharmSpellInitialize();
}
}