Core/PacketIO: Updated and enabled CMSG_REQUEST_STABLED_PETS
This commit is contained in:
@@ -465,14 +465,9 @@ void WorldSession::SendBindPoint(Creature* npc)
|
|||||||
_player->PlayerTalkClass->SendCloseGossip();
|
_player->PlayerTalkClass->SendCloseGossip();
|
||||||
}
|
}
|
||||||
|
|
||||||
void WorldSession::HandleListStabledPetsOpcode(WorldPacket& recvData)
|
void WorldSession::HandleRequestStabledPets(WorldPackets::NPC::RequestStabledPets& packet)
|
||||||
{
|
{
|
||||||
TC_LOG_DEBUG("network", "WORLD: Recv MSG_LIST_STABLED_PETS");
|
if (!CheckStableMaster(packet.StableMaster))
|
||||||
ObjectGuid npcGUID;
|
|
||||||
|
|
||||||
recvData >> npcGUID;
|
|
||||||
|
|
||||||
if (!CheckStableMaster(npcGUID))
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
// remove fake death
|
// remove fake death
|
||||||
@@ -483,7 +478,7 @@ void WorldSession::HandleListStabledPetsOpcode(WorldPacket& recvData)
|
|||||||
if (GetPlayer()->IsMounted())
|
if (GetPlayer()->IsMounted())
|
||||||
GetPlayer()->RemoveAurasByType(SPELL_AURA_MOUNTED);
|
GetPlayer()->RemoveAurasByType(SPELL_AURA_MOUNTED);
|
||||||
|
|
||||||
SendStablePet(npcGUID);
|
SendStablePet(packet.StableMaster);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WorldSession::SendStablePet(ObjectGuid guid)
|
void WorldSession::SendStablePet(ObjectGuid guid)
|
||||||
|
|||||||
@@ -191,3 +191,8 @@ WorldPacket const* WorldPackets::NPC::TrainerBuyFailed::Write()
|
|||||||
|
|
||||||
return &_worldPacket;
|
return &_worldPacket;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void WorldPackets::NPC::RequestStabledPets::Read()
|
||||||
|
{
|
||||||
|
_worldPacket >> StableMaster;
|
||||||
|
}
|
||||||
|
|||||||
@@ -240,6 +240,16 @@ namespace WorldPackets
|
|||||||
int32 SpellID = 0;
|
int32 SpellID = 0;
|
||||||
int32 TrainerFailedReason = 0;
|
int32 TrainerFailedReason = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
class RequestStabledPets final : public ClientPacket
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
RequestStabledPets(WorldPacket&& packet) : ClientPacket(CMSG_REQUEST_STABLED_PETS, std::move(packet)) { }
|
||||||
|
|
||||||
|
void Read() override;
|
||||||
|
|
||||||
|
ObjectGuid StableMaster;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -643,7 +643,7 @@ void OpcodeTable::Initialize()
|
|||||||
DEFINE_HANDLER(CMSG_REQUEST_RAID_INFO, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, WorldPackets::Party::RequestRaidInfo, &WorldSession::HandleRequestRaidInfoOpcode);
|
DEFINE_HANDLER(CMSG_REQUEST_RAID_INFO, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, WorldPackets::Party::RequestRaidInfo, &WorldSession::HandleRequestRaidInfoOpcode);
|
||||||
DEFINE_HANDLER(CMSG_REQUEST_RATED_BATTLEFIELD_INFO, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, WorldPackets::Battleground::RequestRatedBattlefieldInfo, &WorldSession::HandleRequestRatedBattlefieldInfo);
|
DEFINE_HANDLER(CMSG_REQUEST_RATED_BATTLEFIELD_INFO, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, WorldPackets::Battleground::RequestRatedBattlefieldInfo, &WorldSession::HandleRequestRatedBattlefieldInfo);
|
||||||
DEFINE_HANDLER(CMSG_REQUEST_RESEARCH_HISTORY, STATUS_UNHANDLED, PROCESS_INPLACE, WorldPackets::Null, &WorldSession::Handle_NULL);
|
DEFINE_HANDLER(CMSG_REQUEST_RESEARCH_HISTORY, STATUS_UNHANDLED, PROCESS_INPLACE, WorldPackets::Null, &WorldSession::Handle_NULL);
|
||||||
DEFINE_OPCODE_HANDLER_OLD(CMSG_REQUEST_STABLED_PETS, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::HandleListStabledPetsOpcode );
|
DEFINE_HANDLER(CMSG_REQUEST_STABLED_PETS, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, WorldPackets::NPC::RequestStabledPets, &WorldSession::HandleRequestStabledPets);
|
||||||
DEFINE_HANDLER(CMSG_REQUEST_VEHICLE_EXIT, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, WorldPackets::Vehicle::RequestVehicleExit, &WorldSession::HandleRequestVehicleExit);
|
DEFINE_HANDLER(CMSG_REQUEST_VEHICLE_EXIT, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, WorldPackets::Vehicle::RequestVehicleExit, &WorldSession::HandleRequestVehicleExit);
|
||||||
DEFINE_HANDLER(CMSG_REQUEST_VEHICLE_NEXT_SEAT, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, WorldPackets::Vehicle::RequestVehicleNextSeat, &WorldSession::HandleRequestVehicleNextSeat);
|
DEFINE_HANDLER(CMSG_REQUEST_VEHICLE_NEXT_SEAT, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, WorldPackets::Vehicle::RequestVehicleNextSeat, &WorldSession::HandleRequestVehicleNextSeat);
|
||||||
DEFINE_HANDLER(CMSG_REQUEST_VEHICLE_PREV_SEAT, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, WorldPackets::Vehicle::RequestVehiclePrevSeat, &WorldSession::HandleRequestVehiclePrevSeat);
|
DEFINE_HANDLER(CMSG_REQUEST_VEHICLE_PREV_SEAT, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, WorldPackets::Vehicle::RequestVehiclePrevSeat, &WorldSession::HandleRequestVehiclePrevSeat);
|
||||||
|
|||||||
@@ -436,6 +436,7 @@ namespace WorldPackets
|
|||||||
class GossipSelectOption;
|
class GossipSelectOption;
|
||||||
class SpiritHealerActivate;
|
class SpiritHealerActivate;
|
||||||
class TrainerBuySpell;
|
class TrainerBuySpell;
|
||||||
|
class RequestStabledPets;
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace Party
|
namespace Party
|
||||||
@@ -1296,7 +1297,7 @@ class WorldSession
|
|||||||
void HandleSpiritHealerActivate(WorldPackets::NPC::SpiritHealerActivate& packet);
|
void HandleSpiritHealerActivate(WorldPackets::NPC::SpiritHealerActivate& packet);
|
||||||
void HandleNpcTextQueryOpcode(WorldPackets::Query::QueryNPCText& packet);
|
void HandleNpcTextQueryOpcode(WorldPackets::Query::QueryNPCText& packet);
|
||||||
void HandleBinderActivateOpcode(WorldPackets::NPC::Hello& packet);
|
void HandleBinderActivateOpcode(WorldPackets::NPC::Hello& packet);
|
||||||
void HandleListStabledPetsOpcode(WorldPacket& recvPacket);
|
void HandleRequestStabledPets(WorldPackets::NPC::RequestStabledPets& packet);
|
||||||
void HandleStablePet(WorldPacket& recvPacket);
|
void HandleStablePet(WorldPacket& recvPacket);
|
||||||
void HandleStablePetCallback(PreparedQueryResult result);
|
void HandleStablePetCallback(PreparedQueryResult result);
|
||||||
void HandleUnstablePet(WorldPacket& recvPacket);
|
void HandleUnstablePet(WorldPacket& recvPacket);
|
||||||
|
|||||||
Reference in New Issue
Block a user