public/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/liyunfan1223/azerothcore-wotlk.git synced 2026-08-08 15:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
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(); Unit* unitCaster = m_caster->ToUnit();
if (!unitCaster) if (!unitCaster)
{
return SPELL_FAILED_BAD_TARGETS; return SPELL_FAILED_BAD_TARGETS;
}
Creature* pet = unitCaster->GetGuardianPet(); Creature* pet = unitCaster->GetGuardianPet();
if (pet && pet->IsAlive()) if (pet)
return SPELL_FAILED_ALREADY_HAVE_SUMMON; {
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; break;
} }