*Remove possessed summons when aura is cancelled but not when channelling is canncelled. This fix Eye of Kilrogg.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-02-23 09:54:48 -06:00
parent 08b760e953
commit 7ca5b9a8e7
2 changed files with 17 additions and 20 deletions

View File

@@ -2148,25 +2148,6 @@ void Spell::cancel()
finish(false);
// Unsummon summon as possessed creatures on spell cancel
if(m_caster->GetTypeId() == TYPEID_PLAYER)
{
for(int i = 0; i < 3; ++i)
{
if(m_spellInfo->Effect[i] == SPELL_EFFECT_SUMMON &&
(m_spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED ||
m_spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED2 ||
m_spellInfo->EffectMiscValueB[i] == SUMMON_TYPE_POSESSED3))
{
((Player*)m_caster)->StopCastingCharm();
break;
// Possession is removed in the UnSummon function
//if (m_caster->GetCharm())
// ((TemporarySummon*)m_caster->GetCharm())->UnSummon();
}
}
}
m_caster->RemoveDynObject(m_spellInfo->Id);
m_caster->RemoveGameObject(m_spellInfo->Id,true);
}