[11327] Restore hunter's pet call after desmiss work.

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
SeTM 2011-04-08 22:59:49 +04:00 committed by VladimirMangos
parent 773b98538b
commit eb497a636b
2 changed files with 12 additions and 7 deletions

View file

@ -5441,14 +5441,12 @@ void Spell::EffectSummonPet(SpellEffectIndex eff_idx)
return;
}
// not error in case fail hunter call pet
if (!petentry)
return;
CreatureInfo const* cInfo = petentry ? sCreatureStorage.LookupEntry<CreatureInfo>(petentry) : NULL;
CreatureInfo const* cInfo = sCreatureStorage.LookupEntry<CreatureInfo>(petentry);
if(!cInfo)
// == 0 in case call current pet, check only real summon case
if (petentry && !cInfo)
{
sLog.outErrorDb("EffectSummonPet: creature entry %u not found.", petentry);
sLog.outErrorDb("EffectSummonPet: creature entry %u not found for spell %u.", petentry, m_spellInfo->Id);
return;
}
@ -5458,6 +5456,13 @@ void Spell::EffectSummonPet(SpellEffectIndex eff_idx)
if (m_caster->GetTypeId() == TYPEID_PLAYER && NewSummon->LoadPetFromDB((Player*)m_caster, petentry))
return;
// not error in case fail hunter call pet
if (!petentry)
{
delete NewSummon;
return;
}
CreatureCreatePos pos(m_caster, m_caster->GetOrientation());
Map *map = m_caster->GetMap();

View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "11326"
#define REVISION_NR "11327"
#endif // __REVISION_NR_H__