*Update to Mangos 7063.

--HG--
branch : trunk
This commit is contained in:
megamage
2009-01-10 11:30:45 -06:00
parent 1ffb1cef33
commit 218f4c4c4b
11 changed files with 406 additions and 82 deletions
+27 -3
View File
@@ -2051,6 +2051,25 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
m_target->SetReducedThreatPercent(0, 0);
return;
}
if (caster && m_removeMode == AURA_REMOVE_BY_DEATH)
{
// Stop caster Arcane Missle chanelling on death
if (m_spellProto->SpellFamilyName == SPELLFAMILY_MAGE &&
m_spellProto->SpellFamilyFlags&0x0000000000000800LL)
{
caster->InterruptSpell(CURRENT_CHANNELED_SPELL);
return;
}
// Stop caster Penance chanelling on death
if (m_spellProto->SpellFamilyName == SPELLFAMILY_PRIEST &&
m_spellProto->SpellFamilyFlags2 & 0x00000080)
{
caster->InterruptSpell(CURRENT_CHANNELED_SPELL);
return;
}
}
}
// AT APPLY & REMOVE
@@ -6461,8 +6480,13 @@ void Aura::PeriodicDummyTick()
case SPELLFAMILY_SHAMAN:
{
// Astral Shift
// if (spell->Id == 52179)
// return;
if (spell->Id == 52179)
{
// Periodic need for remove visual on stun/fear/silence lost
if (!(m_target->GetUInt32Value(UNIT_FIELD_FLAGS)&(UNIT_FLAG_STUNNED|UNIT_FLAG_FLEEING|UNIT_FLAG_SILENCED)))
m_target->RemoveAurasDueToSpell(52179);
return;
}
break;
}
case SPELLFAMILY_DEATHKNIGHT:
@@ -6471,7 +6495,7 @@ void Aura::PeriodicDummyTick()
if (spell->SpellFamilyFlags & 0x0000000000000020LL)
{
if (caster)
caster->CastCustomSpell(m_target, 52212, &m_modifier.m_amount, NULL, NULL, true);
caster->CastCustomSpell(m_target, 52212, &m_modifier.m_amount, NULL, NULL, true, 0, this);
return;
}
// Raise Dead