diff options
| author | QAston <qaston@gmail.com> | 2012-06-14 03:06:09 -0700 |
|---|---|---|
| committer | QAston <qaston@gmail.com> | 2012-06-14 03:06:09 -0700 |
| commit | d4cc56328e9c505902dc33cc594a43bd3ee65d18 (patch) | |
| tree | 1c2a70315294183da6b85ac58e630bdd5b81f57e /src | |
| parent | ace68d5f4f87284c40171ac287ca21c1bb5de15f (diff) | |
| parent | 63dd6251540eb3e392d8789f92035b021fb773e2 (diff) | |
Merge pull request #6792 from drskull/master
Core/Spells: Fix Magnet Takecharges
Diffstat (limited to 'src')
| -rwxr-xr-x | src/server/game/Entities/Unit/Unit.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 3305c4a9325..daa8c1e05de 100755 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -14525,6 +14525,11 @@ void Unit::ProcDamageAndSpellFor(bool isVictim, Unit* target, uint32 procFlag, u if (procSpell && (triggeredByAura->GetMiscValue() & procSpell->SchoolMask)) // School check takeCharges = true; break; + case SPELL_AURA_SPELL_MAGNET: + // Skip Melee hits and targets with magnet aura + if (procSpell && (triggeredByAura->GetBase()->GetUnitOwner()->ToUnit() == ToUnit())) // Magnet + takeCharges = true; + break; case SPELL_AURA_MOD_POWER_COST_SCHOOL_PCT: case SPELL_AURA_MOD_POWER_COST_SCHOOL: // Skip melee hits and spells ws wrong school or zero cost |