ElderShell/EverWrath
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(Core/Spells): Revive Pet cannot be cast if there is not pet to resurrect (#12818)

Browse source 
- Closes #12776
This commit is contained in:
UltraNix 2022-09-12 03:01:53 +02:00 • committed by GitHub
parent d40e3340fb
commit 2ef8d2e1e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/server/game/Spells/Spell.cpp
View file

@ -6336,11 +6336,26 @@ SpellCastResult Spell::CheckCast(bool strict)
{
Unit* unitCaster = m_caster->ToUnit();
if (!unitCaster)
{
return SPELL_FAILED_BAD_TARGETS;
}
Creature* pet = unitCaster->GetGuardianPet();
if (pet && pet->IsAlive())
return SPELL_FAILED_ALREADY_HAVE_SUMMON;
if (pet)
{
if (pet->IsAlive())
{
return SPELL_FAILED_ALREADY_HAVE_SUMMON;
}
}
else if (Player* playerCaster = m_caster->ToPlayer())
{
PetStable& petStable = playerCaster->GetOrInitPetStable();
if (!petStable.CurrentPet && petStable.UnslottedPets.empty())
{
return SPELL_FAILED_NO_PET;
}
}
break;
}