fix heroism/bloodlust stack based on ShinDarth previous fix on TrinityCore
This commit is contained in:
@@ -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()
|
||||||
|
|||||||
Reference in New Issue
Block a user