nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-01-14 09:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(Core/Spells): Added some exceptions to `SPELL_AURA_PREVENT_REGENE… (#9844)

Browse Source 
* fix(Core/Spells): Added some exceptions to `SPELL_AURA_PREVENT_REGENERATE_POWER` auras.

Fixes #2042
This commit is contained in:
UltraNix
2022-02-10 15:34:00 +01:00
committed by GitHub
parent 210029095a
commit 0fa4a90aa8
3 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -12324,8 +12324,12 @@ bool Unit::IsImmunedToSpellEffect(SpellInfo const* spellInfo, uint32 index) cons
uint32 effect = spellInfo->Effects[index].Effect;
SpellImmuneList const& effectList = m_spellImmune[IMMUNITY_EFFECT];
for (SpellImmuneList::const_iterator itr = effectList.begin(); itr != effectList.end(); ++itr)
if (itr->type == effect && (itr->spellId != 62692 || spellInfo->Effects[index].MiscValue == POWER_MANA))
{
if (itr->type == effect && (itr->spellId != 62692 || (spellInfo->Effects[index].MiscValue == POWER_MANA && !CanRestoreMana(spellInfo))))
{
return true;
}
}
if (uint32 mechanic = spellInfo->Effects[index].Mechanic)
{
@@ -12339,10 +12343,18 @@ bool Unit::IsImmunedToSpellEffect(SpellInfo const* spellInfo, uint32 index) cons
{
SpellImmuneList const& list = m_spellImmune[IMMUNITY_STATE];
for (SpellImmuneList::const_iterator itr = list.begin(); itr != list.end(); ++itr)
if (itr->type == aura && (itr->spellId != 64848 || spellInfo->Effects[index].MiscValue == POWER_MANA))
{
if (itr->type == aura && (itr->spellId != 64848 || (spellInfo->Effects[index].MiscValue == POWER_MANA && !CanRestoreMana(spellInfo))))
{
if (!spellInfo->HasAttribute(SPELL_ATTR3_ALWAYS_HIT))
{
if (itr->blockType == SPELL_BLOCK_TYPE_ALL || spellInfo->IsPositive()) // xinef: added for pet scaling
{
return true;
}
}
}
}
if (!spellInfo->HasAttribute(SPELL_ATTR2_NO_SCHOOL_IMMUNITIES))
{
@@ -20454,3 +20466,27 @@ void Unit::Whisper(uint32 textId, Player* target, bool isBossWhisper /*= false*/
ChatHandler::BuildChatPacket(data, isBossWhisper ? CHAT_MSG_RAID_BOSS_WHISPER : CHAT_MSG_MONSTER_WHISPER, LANG_UNIVERSAL, this, target, bct->GetText(locale, getGender()), 0, "", locale);
target->SendDirectMessage(&data);
}
bool Unit::CanRestoreMana(SpellInfo const* spellInfo) const
{
// Aura of Despair exceptions
switch (spellInfo->Id)
{
case 30824: // Shamanistic Rage
case 31786: // Spiritual Attunement
case 31930: // Judgements of the Wise
case 34075: // Aspect of the Viper
case 34720: // Thrill of the hunt
case 47755: // Rapture
case 63337: // Saronite Vapors (regenerate mana)
case 63375: // Improved stormstrike
case 64372: // Lifebloom
return true;
case 54428: // Divine Plea - only with talent Guarded by the Light
return HasSpell(53583);
default:
break;
}
return false;
}