Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Creature: Fix another pet assert

Browse Source 
Fix an assert triggered when dismissing a Warlock pet while it's casting a spell
This commit is contained in:
jackpoz
2019-09-01 19:05:29 +02:00
parent dab66cb8d0
commit 4074cb0f01
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/server/game/Entities/Creature/Creature.cpp
View File

@@ -3158,7 +3158,11 @@ void Creature::ReleaseSpellFocus(Spell const* focusSpell, bool withDelay)
void Creature::ReacquireSpellFocusTarget()
{
ASSERT(HasSpellFocus());
if (!HasSpellFocus())
{
TC_LOG_ERROR("entities.unit", "Creature::ReacquireSpellFocusTarget() being called with HasSpellFocus() returning false. %s", GetDebugInfo().c_str());
return;
}
SetGuidValue(UNIT_FIELD_TARGET, _spellFocusInfo.Target);

3
src/server/game/Handlers/PetHandler.cpp
View File

@@ -255,8 +255,7 @@ void WorldSession::HandlePetActionHelper(Unit* pet, ObjectGuid guid1, uint32 spe
if (((Pet*)pet)->getPetType() == HUNTER_PET)
GetPlayer()->RemovePet((Pet*)pet, PET_SAVE_AS_DELETED);
else
// dismissing a summoned pet is like killing them (this prevents returning a soulshard...)
pet->setDeathState(CORPSE);
GetPlayer()->RemovePet((Pet*)pet, PET_SAVE_NOT_IN_SLOT);
}
else if (pet->HasUnitTypeMask(UNIT_MASK_MINION))
{