From 0a2876c09199e17728d7ef32f891f9037f536b90 Mon Sep 17 00:00:00 2001 From: xinef1 Date: Sat, 31 Dec 2016 20:50:56 +0100 Subject: Core/Pets: Fixed exploit where warlock can abandon its pet to generate new name (#18606) (cherry-picked from 8ce5712552df47c6eff45c596b95a8890826d8b4) --- src/server/game/Handlers/PetHandler.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/server/game/Handlers/PetHandler.cpp b/src/server/game/Handlers/PetHandler.cpp index 3b1ff9b7d36..4d91ee2d11b 100644 --- a/src/server/game/Handlers/PetHandler.cpp +++ b/src/server/game/Handlers/PetHandler.cpp @@ -592,13 +592,11 @@ void WorldSession::HandlePetAbandon(WorldPackets::Pet::PetAbandon& packet) if (!_player->IsInWorld()) return; + // pet/charmed Creature* pet = ObjectAccessor::GetCreatureOrPetOrVehicle(*_player, packet.Pet); - if (pet) + if (pet && pet->ToPet() && pet->ToPet()->getPetType() == HUNTER_PET) { - if (pet->IsPet()) - _player->RemovePet(pet->ToPet(), PET_SAVE_AS_DELETED); - else if (pet->GetGUID() == _player->GetCharmGUID()) - _player->StopCastingCharm(); + _player->RemovePet((Pet*)pet, PET_SAVE_AS_DELETED); } } -- cgit v1.2.3