aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game/SpellAuras.cpp4
-rw-r--r--src/game/Unit.cpp2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 2040722c17e..22c540ef9db 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -1423,6 +1423,10 @@ void AuraEffect::HandleAuraEffectSpecificMods(bool apply, bool Real, bool change
// Innervate
else if (m_spellProto->Id == 29166 && GetAuraName() == SPELL_AURA_PERIODIC_ENERGIZE)
m_amount = m_target->GetCreatePowers(POWER_MANA) * m_amount / (GetTotalTicks() * 100.0f);
+ // Thorns
+ else if (m_spellProto->SpellFamilyFlags[0] & 0x100 && GetAuraName() == SPELL_AURA_DAMAGE_SHIELD)
+ // 3.3% from sp bonus
+ DoneActualBenefit = caster->SpellBaseDamageBonus(GetSpellSchoolMask(m_spellProto)) * 0.033f;
break;
}
case SPELLFAMILY_ROGUE:
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 12166cc917a..e80ccf019f2 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -8848,7 +8848,7 @@ Unit* Unit::SelectMagnetTarget(Unit *victim, SpellEntry const *spellInfo)
if(Unit* magnet = (*itr)->GetParentAura()->GetUnitSource())
if(magnet->isAlive())
{
- (*i)->GetParentAura()->DropAuraCharge();
+ (*itr)->GetParentAura()->DropAuraCharge();
return magnet;
}
}