Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Pets: Relax summoning pet assertion condition

Browse Source 
Closes #27778
This commit is contained in:
Shauren
2022-02-15 00:27:05 +01:00
parent e0790d8107
commit 11aafe53b1
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -359,10 +359,14 @@ bool Pet::LoadPetFromDB(Player* owner, uint32 petEntry, uint32 petnumber, bool c
{
return pet && pet->PetNumber == petInfo->PetNumber;
});
ASSERT(!petStable->CurrentPetIndex);
ASSERT(activePetItr != petStable->ActivePets.end());
petStable->SetCurrentActivePetIndex(std::distance(petStable->ActivePets.begin(), activePetItr));
uint32 newPetIndex = std::distance(petStable->ActivePets.begin(), activePetItr);
// Check that we either have no pet (unsummoned by player) or it matches temporarily unsummoned pet by server (for example on flying mount)
ASSERT(!petStable->CurrentPetIndex || petStable->CurrentPetIndex == newPetIndex);
petStable->SetCurrentActivePetIndex(newPetIndex);
}
// Send fake summon spell cast - this is needed for correct cooldown application for spells