aboutsummaryrefslogtreecommitdiff
path: root/src/game/SpellAuras.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/SpellAuras.cpp')
-rw-r--r--src/game/SpellAuras.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 66d037ffe41..5f39e3f585c 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -584,7 +584,7 @@ void Aura::Update(uint32 diff)
else
m_target->RemoveAurasByCasterSpell(GetId(),GetCasterGUID());
}
- else if (caster->GetPower(powertype)>manaPerSecond)
+ else if (caster->GetPower(powertype)>=manaPerSecond)
caster->ModifyPower(powertype,-manaPerSecond);
else
m_target->RemoveAurasByCasterSpell(GetId(),GetCasterGUID());
@@ -5424,14 +5424,6 @@ void Aura::HandleSpiritOfRedemption( bool apply, bool Real )
void Aura::CleanupTriggeredSpells()
{
- if (m_spellProto->SpellFamilyName == SPELLFAMILY_WARRIOR && m_spellProto->SpellFamilyFlags[1] & 0x00000010 || m_spellProto->SpellFamilyFlags[0] & 0x00000020)
- {
- // Blood Frenzy remove
- m_target->RemoveAurasDueToSpell(30069);
- m_target->RemoveAurasDueToSpell(30070);
- return;
- }
-
uint32 tSpellId = m_spellProto->EffectTriggerSpell[GetEffIndex()];
if(!tSpellId)
return;