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

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
mangos · Apr 8, 2011 · d4aef13 · d4aef13
1 parent b7eadbe
commit d4aef13
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
@@ -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();

diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "11326"
+ #define REVISION_NR "11327"
 #endif // __REVISION_NR_H__