From 51d0e0fa8cc47e8d675259ec485fa2b62fa77041 Mon Sep 17 00:00:00 2001
From: Astellar <none@none>
Date: Tue, 5 Jan 2010 01:46:22 +0300
Subject: Fixed Issue 10. Now summoned elemental is correctly despawned.

Try to find a better place for such check...

--HG--
branch : trunk
---
 src/game/Totem.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/game/Totem.cpp b/src/game/Totem.cpp
index a82f273bdbc..0368abe1eef 100644
--- a/src/game/Totem.cpp
+++ b/src/game/Totem.cpp
@@ -112,7 +112,19 @@ void Totem::UnSummon()
     CombatStop();
     RemoveAurasDueToSpell(GetSpell());
 
-    // clear owenr's totem slot
+    // All summoned by totem minions must disappear when it is removed.
+    if (const SpellEntry* spInfo = sSpellStore.LookupEntry(GetSpell()))
+    {
+        for (int i = 0; i < MAX_SPELL_EFFECTS; ++i)
+        {
+            if (spInfo->Effect[i] != SPELL_EFFECT_SUMMON)
+                continue;
+
+            m_owner->RemoveAllMinionsByEntry(spInfo->EffectMiscValue[i]);
+        }
+    }
+
+    // clear owner's totem slot
     for (int i = SUMMON_SLOT_TOTEM; i < MAX_TOTEM_SLOT; ++i)
     {
         if(m_owner->m_SummonSlot[i]==GetGUID())
-- 
cgit v1.2.3