Merge branch 'custom' of git@gitlab.com:azerothshard/azerothcore.git into custom

This commit is contained in:
Yehonal
2016-08-10 12:39:33 +02:00
@@ -522,12 +522,15 @@ class spell_sha_bloodlust : public SpellScriptLoader
{
if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_SATED))
return false;
if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_EXHAUSTION))
return false;
return true;
}
void RemoveInvalidTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_SHAMAN_SATED));
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_SHAMAN_EXHAUSTION));
}
void ApplyDebuff()
@@ -977,12 +980,15 @@ class spell_sha_heroism : public SpellScriptLoader
{
if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_EXHAUSTION))
return false;
if (!sSpellMgr->GetSpellInfo(SPELL_SHAMAN_SATED))
return false;
return true;
}
void RemoveInvalidTargets(std::list<WorldObject*>& targets)
{
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_SHAMAN_EXHAUSTION));
targets.remove_if(Trinity::UnitAuraCheck(true, SPELL_SHAMAN_SATED));
}
void ApplyDebuff()