Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Spells: Fix summoning warlock pets in case that pet has never been summoned before

Browse Source
This commit is contained in:
Shauren
2020-08-17 11:52:44 +02:00
parent 9c5876d8ab
commit bbcf00257e
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/server/game/Spells/Spell.cpp
View File

@@ -5763,32 +5763,34 @@ SpellCastResult Spell::CheckCast(bool strict, uint32* param1 /*= nullptr*/, uint
if (playerCaster && playerCaster->GetPetStable())
{
std::pair<PetStable::PetInfo const*, PetSaveMode> info = Pet::GetLoadPetInfo(*playerCaster->GetPetStable(), m_spellInfo->Effects[i].MiscValue, 0, false);
if (!info.first)
if (info.first)
{
if (info.first->Type == HUNTER_PET)
{
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);
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;
}
if (info.first->Type == HUNTER_PET)
{
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);
return SPELL_FAILED_DONT_REPORT;
}
}
}
break;