nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-16 02:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Pets): fix crash at pet resurrect (#10120)

Browse Source
This commit is contained in:
Kargatum
2022-01-16 05:08:54 +07:00
committed by GitHub
parent 2781c9810f
commit 7f05e20994
8 changed files with 301 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/server/scripts/Commands/cs_pet.cpp
View File

@@ -66,44 +66,24 @@ public:
// Creatures with family 0 crashes the server
if (!creatrueTemplate->family)
{
handler->PSendSysMessage("This creature cannot be tamed. (family id: 0).");
handler->PSendSysMessage(LANG_CREATURE_NON_TAMEABLE, creatrueTemplate->Entry);
handler->SetSentErrorMessage(true);
return false;
}
PetStable const* petStable = player->GetPetStable();
if (petStable && (petStable->CurrentPet || petStable->GetUnslottedHunterPet()))
if (player->IsExistPet())
{
handler->PSendSysMessage("You already have a pet");
handler->SendSysMessage(LANG_YOU_ALREADY_HAVE_PET);
handler->SetSentErrorMessage(true);
return false;
}
// Everything looks OK, create new pet
Pet* pet = player->CreateTamedPetFrom(creatureTarget);
// "kill" original creature
creatureTarget->DespawnOrUnsummon();
uint8 level = (creatureTarget->getLevel() < (player->getLevel() - 5)) ? (player->getLevel() - 5) : player->getLevel();
// prepare visual effect for levelup
pet->SetUInt32Value(UNIT_FIELD_LEVEL, level - 1);
// add to world
pet->GetMap()->AddToMap(pet->ToCreature());
// visual effect for levelup
pet->SetUInt32Value(UNIT_FIELD_LEVEL, level);
// caster have pet now
player->SetMinion(pet, true);
pet->InitTalentForLevel();
pet->SavePetToDB(PET_SAVE_AS_CURRENT);
player->PetSpellInitialize();
if (!player->CreatePet(creatureTarget))
{
handler->PSendSysMessage(LANG_CREATURE_NON_TAMEABLE, creatrueTemplate->Entry);
handler->SetSentErrorMessage(true);
return false;
}
return true;
}