diff options
| author | NoName <322016+Faq@users.noreply.github.com> | 2020-04-08 22:35:01 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-08 21:35:01 +0200 |
| commit | 566dcfc5181b91f884ad4e6c917afce70bf67fb8 (patch) | |
| tree | 89528356aab74ebe13bb62b012bcfa511e480acd /src/server/game/Handlers/PetHandler.cpp | |
| parent | 31018c36527755166d8a297ac9e6c98a66f014ae (diff) | |
Core/PacketIO: Updated CMSG_DISMISS_CRITTER (#24412)
based on cherry-pick 6fbfc61de1931f1e70aee80249535436e368c113
Co-authored-by: Carbenium <carbenium@outlook.com>
Diffstat (limited to 'src/server/game/Handlers/PetHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/PetHandler.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index eba79a86927..4a68a7c2d16 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -27,6 +27,7 @@ #include "Opcodes.h" #include "Pet.h" #include "PetAI.h" +#include "PetPackets.h" #include "Player.h" #include "Spell.h" #include "SpellHistory.h" @@ -36,19 +37,14 @@ #include "World.h" #include "WorldPacket.h" -void WorldSession::HandleDismissCritter(WorldPacket& recvData) +void WorldSession::HandleDismissCritter(WorldPackets::Pet::DismissCritter& packet) { - ObjectGuid guid; - recvData >> guid; - - TC_LOG_DEBUG("network.opcode", "WORLD: Received CMSG_DISMISS_CRITTER for %s", guid.ToString().c_str()); - - Unit* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, guid); + Unit* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, packet.CritterGUID); if (!pet) { TC_LOG_DEBUG("entities.pet", "Vanitypet (%s) does not exist - player '%s' (%s / account: %u) attempted to dismiss it (possibly lagged out)", - guid.ToString().c_str(), GetPlayer()->GetName().c_str(), GetPlayer()->GetGUID().ToString().c_str(), GetAccountId()); + packet.CritterGUID.ToString().c_str(), GetPlayer()->GetName().c_str(), GetPlayer()->GetGUID().ToString().c_str(), GetAccountId()); return; } |