Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow state/effect immunities ignore whole spell when one effect is immuned

Browse Source 
(Fixes getting part of CC auras with some immunities)

--HG--
branch : trunk
This commit is contained in:
thenecromancer
2010-01-13 10:20:00 +01:00
parent 6b07806d0c
commit 8dd67e8bb3
6 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/game/Unit.cpp
View File

@@ -10653,6 +10653,14 @@ bool Unit::IsImmunedToSpell(SpellEntry const* spellInfo)
if (itr->type == spellInfo->Mechanic)
return true;
}
for (int i=0;i<3;++i)
{
// State/effect immunities applied by aura expect full spell immunity
// However function also check for mechanic, so ignore that for now
if (IsImmunedToSpellEffect(spellInfo, i, false))
return true;
}
if (spellInfo->Id != 42292 && spellInfo->Id !=59752)
{
@@ -10667,7 +10675,7 @@ bool Unit::IsImmunedToSpell(SpellEntry const* spellInfo)
return false;
}
bool Unit::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) const
bool Unit::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index, bool checkMechanic) const
{
if (!spellInfo)
return false;
@@ -10678,12 +10686,15 @@ bool Unit::IsImmunedToSpellEffect(SpellEntry const* spellInfo, uint32 index) con
if (itr->type == effect)
return true;
if (uint32 mechanic = spellInfo->EffectMechanic[index])
if (checkMechanic)
{
SpellImmuneList const& mechanicList = m_spellImmune[IMMUNITY_MECHANIC];
for (SpellImmuneList::const_iterator itr = mechanicList.begin(); itr != mechanicList.end(); ++itr)
if (itr->type == spellInfo->EffectMechanic[index])
return true;
if (uint32 mechanic = spellInfo->EffectMechanic[index])
{
SpellImmuneList const& mechanicList = m_spellImmune[IMMUNITY_MECHANIC];
for (SpellImmuneList::const_iterator itr = mechanicList.begin(); itr != mechanicList.end(); ++itr)
if (itr->type == spellInfo->EffectMechanic[index])
return true;
}
}
if (uint32 aura = spellInfo->EffectApplyAuraName[index])