*Update spell_proc_event entry for Bloodsurge.

*Bring back charge drop on magnet spell redirection.

--HG--
branch : trunk
This commit is contained in:
QAston
2009-08-28 20:54:58 +02:00
parent 6a988ad6f0
commit b6a9c84aa0
5 changed files with 13 additions and 5 deletions
+1 -1
View File
@@ -6988,7 +6988,7 @@ int32 AuraEffect::CalculateCrowdControlAuraAmount(Unit * caster)
return damageCap;
}
int32 AuraEffect::IsPeriodicTickCrit(Unit const * pCaster) const
bool AuraEffect::IsPeriodicTickCrit(Unit const * pCaster) const
{
Unit::AuraEffectList const& mPeriodicCritAuras= pCaster->GetAurasByType(SPELL_AURA_ABILITY_PERIODIC_CRIT);
for(Unit::AuraEffectList::const_iterator itr = mPeriodicCritAuras.begin(); itr != mPeriodicCritAuras.end(); ++itr)
+1 -1
View File
@@ -403,7 +403,7 @@ class TRINITY_DLL_SPEC AuraEffect
bool m_isPersistent:1;
bool m_isApplied:1;
private:
int32 IsPeriodicTickCrit(Unit const * pCaster) const;
bool IsPeriodicTickCrit(Unit const * pCaster) const;
};
class TRINITY_DLL_SPEC AreaAuraEffect : public AuraEffect
+3
View File
@@ -8847,7 +8847,10 @@ Unit* Unit::SelectMagnetTarget(Unit *victim, SpellEntry const *spellInfo)
for(Unit::AuraEffectList::const_iterator itr = magnetAuras.begin(); itr != magnetAuras.end(); ++itr)
if(Unit* magnet = (*itr)->GetParentAura()->GetUnitSource())
if(magnet->isAlive())
{
(*i)->GetParentAura()->DropAuraCharge();
return magnet;
}
}
// Melee && ranged case
else