diff options
| author | QAston <none@none> | 2009-08-28 20:54:58 +0200 |
|---|---|---|
| committer | QAston <none@none> | 2009-08-28 20:54:58 +0200 |
| commit | b6a9c84aa0f0a006f4de355b77bb9858b7593956 (patch) | |
| tree | 5ff8d926518d5159fd1eb60dc86a8f7601a8ea97 /src | |
| parent | 6a988ad6f0750dc35290d132f8a9ff8d88170bf2 (diff) | |
*Update spell_proc_event entry for Bloodsurge.
*Bring back charge drop on magnet spell redirection.
--HG--
branch : trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/SpellAuras.cpp | 2 | ||||
| -rw-r--r-- | src/game/SpellAuras.h | 2 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index d698553487b..2040722c17e 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -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) diff --git a/src/game/SpellAuras.h b/src/game/SpellAuras.h index 1c94be8034a..4fe680f26fc 100644 --- a/src/game/SpellAuras.h +++ b/src/game/SpellAuras.h @@ -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 diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp index a828f634ec9..12166cc917a 100644 --- a/src/game/Unit.cpp +++ b/src/game/Unit.cpp @@ -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 |