aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorQAston <none@none>2009-04-12 10:35:28 +0200
committerQAston <none@none>2009-04-12 10:35:28 +0200
commitb1b53addcc4afbd0f7bf503ada16669d99dd70a2 (patch)
tree636d86d64c3424d03742bad5d6406c71484b13c5 /src
parentea3e9507585e2454b4b1f50cc5a559fba8575579 (diff)
*Fix shadowflame
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/game/Player.cpp2
-rw-r--r--src/game/SpellAuras.cpp8
2 files changed, 1 insertions, 9 deletions
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index 1d269cb4753..b7d9865729c 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -16896,7 +16896,7 @@ void Player::RemoveSpellMods(Spell const* spell)
if (mod && mod->charges == -1 && (mod->lastAffected == spell || mod->lastAffected==NULL))
{
- RemoveAurasDueToSpell(mod->spellId);
+ RemoveAurasDueToSpell(mod->spellId, AURA_REMOVE_BY_EXPIRE);
if (m_spellMods[i].empty())
break;
else
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 5c41dc22d9e..5fedc013188 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -2438,14 +2438,6 @@ void AuraEffect::HandleAuraDummy(bool apply, bool Real)
caster->CastSpell(m_target, GetAmount(), true);
return;
}
- // Focused Magic
- if(m_spellProto->Id == 54646)
- {
- // only on remove by crit
- if(caster && GetParentAura()->GetRemoveMode() == AURA_REMOVE_BY_EXPIRE)
- caster->CastSpell(caster,54648, true);
- return;
- }
break;
}
}