diff options
| author | Shauren <shauren.trinity@gmail.com> | 2020-08-17 09:19:43 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2020-08-17 09:19:43 +0200 |
| commit | 9c5876d8abdc71830c5eb12a6ed036621df4bd6e (patch) | |
| tree | 1fb85f92d00dab4c92416238508765f00f595182 /src | |
| parent | a9d493c4564cdaa7efe400408f3582f1cdbb8cde (diff) | |
Core/Spells: Fix summoning SUMMON_PET type pets
Closes #25265
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 85d3def3648..1f7e84a729f 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5769,22 +5769,25 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint return SPELL_FAILED_DONT_REPORT; } - if (info.first->Type == HUNTER_PET && !info.first->Health) + if (info.first->Type == HUNTER_PET) { - playerCaster->SendTameFailure(PETTAME_DEAD); - return SPELL_FAILED_DONT_REPORT; - } + if (!info.first->Health) + { + playerCaster->SendTameFailure(PETTAME_DEAD); + return SPELL_FAILED_DONT_REPORT; + } - CreatureTemplate const* creatureInfo = sObjectMgr->GetCreatureTemplate(info.first->CreatureId); - if (!creatureInfo || !creatureInfo->IsTameable(playerCaster->CanTameExoticPets())) - { - // if problem in exotic pet - if (creatureInfo && creatureInfo->IsTameable(true)) - playerCaster->SendTameFailure(PETTAME_CANTCONTROLEXOTIC); - else - playerCaster->SendTameFailure(PETTAME_NOPETAVAILABLE); + CreatureTemplate const* creatureInfo = sObjectMgr->GetCreatureTemplate(info.first->CreatureId); + if (!creatureInfo || !creatureInfo->IsTameable(playerCaster->CanTameExoticPets())) + { + // if problem in exotic pet + if (creatureInfo && creatureInfo->IsTameable(true)) + playerCaster->SendTameFailure(PETTAME_CANTCONTROLEXOTIC); + else + playerCaster->SendTameFailure(PETTAME_NOPETAVAILABLE); - return SPELL_FAILED_DONT_REPORT; + return SPELL_FAILED_DONT_REPORT; + } } } |