From bbcf00257ebdb75fa30f0484cb185058139f8ae4 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 17 Aug 2020 11:52:44 +0200 Subject: Core/Spells: Fix summoning warlock pets in case that pet has never been summoned before --- src/server/game/Spells/Spell.cpp | 42 +++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 1f7e84a729f..11e24e6e8b1 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5763,32 +5763,34 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint if (playerCaster && playerCaster->GetPetStable()) { std::pair info = Pet::GetLoadPetInfo(*playerCaster->GetPetStable(), m_spellInfo->Effects[i].MiscValue, 0, false); - if (!info.first) + if (info.first) { - playerCaster->SendTameFailure(PETTAME_NOPETAVAILABLE); - return SPELL_FAILED_DONT_REPORT; - } - - if (info.first->Type == HUNTER_PET) - { - if (!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; + } } } + else if (!m_spellInfo->Effects[i].MiscValue) // when miscvalue is present it is allowed to create new pets + { + playerCaster->SendTameFailure(PETTAME_NOPETAVAILABLE); + return SPELL_FAILED_DONT_REPORT; + } } break; -- cgit v1.2.3