fix heroism/bloodlust stack based on ShinDarth previous fix on TrinityCore

This commit is contained in:
Gargarensis
2016-08-08 16:34:03 +02:00
committed by Yehonal
parent 7fa2d80c68
commit f23cbe2127
+6
View File
@@ -522,12 +522,15 @@ class spell_sha_bloodlust : public SpellScriptLoader
{ {
if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_SATED)) if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_SATED))
return false; return false;
if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_EXHAUSTION))
return false;
return true; return true;
} }
void RemoveInvalidTargets(std::list<WorldObject*>& targets) void RemoveInvalidTargets(std::list<WorldObject*>& targets)
{ {
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_SHAMAN_SATED)); targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_SHAMAN_SATED));
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_SHAMAN_EXHAUSTION));
} }
void ApplyDebuff() void ApplyDebuff()
@@ -977,12 +980,15 @@ class spell_sha_heroism : public SpellScriptLoader
{ {
if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_EXHAUSTION)) if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_EXHAUSTION))
return false; return false;
if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_SATED))
return false;
return true; return true;
} }
void RemoveInvalidTargets(std::list<WorldObject*>& targets) void RemoveInvalidTargets(std::list<WorldObject*>& targets)
{ {
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_SHAMAN_EXHAUSTION)); targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_SHAMAN_EXHAUSTION));
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_SHAMAN_SATED));
} }
void ApplyDebuff() void ApplyDebuff()