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

fix(Core/Pets): fixed crash happening when current pet is forcibly removed (#10025)

Browse Source
This commit is contained in:
Kargatum
2022-01-10 19:19:43 +07:00
committed by GitHub
parent b2df4aa970
commit c1ebda66ba
8 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Entities/Creature/TemporarySummon.cpp
View File

@@ -285,7 +285,7 @@ void TempSummon::UnSummon(uint32 msTime)
//ASSERT(!IsPet());
if (IsPet())
{
((Pet*)this)->Remove(PET_SAVE_NOT_IN_SLOT);
ToPet()->Remove(PET_SAVE_NOT_IN_SLOT);
ASSERT(!IsInWorld());
return;
}

2
src/server/game/Entities/Pet/Pet.cpp
View File

@@ -2252,6 +2252,8 @@ bool Pet::Create(ObjectGuid::LowType guidlow, Map* map, uint32 phaseMask, uint32
if (!InitEntry(Entry))
return false;
// Force regen flag for player pets, just like we do for players themselves
SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_REGENERATE_POWER);
SetSheath(SHEATH_STATE_MELEE);
return true;

35
src/server/game/Entities/Player/Player.cpp
View File

@@ -8656,7 +8656,7 @@ Pet* Player::GetPet() const
if (!pet)
return nullptr;
if (IsInWorld() && pet)
if (IsInWorld())
return pet;
//there may be a guardian in slot
@@ -8712,11 +8712,40 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent)
m_temporaryUnsummonedPetNumber = 0;
}
if (!pet || pet->GetOwnerGUID() != GetGUID())
if (!pet)
{
if (mode == PET_SAVE_NOT_IN_SLOT && m_petStable && m_petStable->CurrentPet)
{
// Handle removing pet while it is in "temporarily unsummoned" state, for example on mount
CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_CHAR_PET_SLOT_BY_ID);
stmt->setUInt8(0, PET_SAVE_NOT_IN_SLOT);
stmt->setUInt32(1, GetGUID().GetCounter());
stmt->setUInt32(2, m_petStable->CurrentPet->PetNumber);
CharacterDatabase.Execute(stmt);
m_petStable->UnslottedPets.push_back(std::move(*m_petStable->CurrentPet));
m_petStable->CurrentPet.reset();
}
return;
}
pet->CombatStop();
if (returnreagent)
{
switch (pet->GetEntry())
{
//warlock pets except imp are removed(?) when logging out
case 1860:
case 1863:
case 417:
case 17252:
mode = PET_SAVE_NOT_IN_SLOT;
break;
}
}
// only if current pet in slot
pet->SavePetToDB(mode);
@@ -13337,7 +13366,7 @@ void Player::AddKnownCurrency(uint32 itemId)
void Player::UnsummonPetTemporaryIfAny()
{
Pet* pet = GetPet();
if (!pet || !pet->IsInWorld())
if (!pet)
return;
if (!m_temporaryUnsummonedPetNumber && pet->isControlled() && !pet->isTemporarySummoned())

11
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -10168,10 +10168,15 @@ void Unit::SetMinion(Minion* minion, bool apply)
if (oldPet != minion && (oldPet->IsPet() || minion->IsPet() || oldPet->GetEntry() != minion->GetEntry()))
{
// remove existing minion pet
if (oldPet->IsPet())
((Pet*)oldPet)->Remove(PET_SAVE_AS_CURRENT);
if (Pet* oldPetAsPet = oldPet->ToPet())
{
oldPetAsPet->Remove(PET_SAVE_NOT_IN_SLOT);
}
else
{
oldPet->UnSummon();
}
SetPetGUID(minion->GetGUID());
SetMinionGUID(ObjectGuid::Empty);
}
@@ -10239,6 +10244,7 @@ void Unit::SetMinion(Minion* minion, bool apply)
{
// All summoned by totem minions must disappear when it is removed.
if (SpellInfo const* spInfo = sSpellMgr->GetSpellInfo(minion->ToTotem()->GetSpell()))
{
for (int i = 0; i < MAX_SPELL_EFFECTS; ++i)
{
if (spInfo->Effects[i].Effect != SPELL_EFFECT_SUMMON)
@@ -10246,6 +10252,7 @@ void Unit::SetMinion(Minion* minion, bool apply)
RemoveAllMinionsByEntry(spInfo->Effects[i].MiscValue);
}
}
}
if (GetTypeId() == TYPEID_PLAYER)