From 2fab507ed6d92968e439f28f43f43d122152ae35 Mon Sep 17 00:00:00 2001 From: Laise Date: Thu, 28 Jul 2011 11:49:47 +0300 Subject: [PATCH] [11758] better check for totem immunity for channeled spells --- src/game/Spell.cpp | 6 +++++- src/shared/revision_nr.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 0b725b9bf..26c0bb067 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -4648,7 +4648,11 @@ SpellCastResult Spell::CheckCast(bool strict) } // totem immunity for channeled spells(needs to be before spell cast) - if (IsChanneledSpell(m_spellInfo) && target->GetTypeId() == TYPEID_UNIT && ((Creature*)target)->IsTotem()) + // spell attribs for player channeled spells + if ((m_spellInfo->AttributesEx & SPELL_ATTR_EX_UNK14) + && (m_spellInfo->AttributesEx5 & SPELL_ATTR_EX5_UNK13) + && target->GetTypeId() == TYPEID_UNIT + && ((Creature*)target)->IsTotem()) return SPELL_FAILED_IMMUNE; bool non_caster_target = target != m_caster && !IsSpellWithCasterSourceTargetsOnly(m_spellInfo); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index c901523d4..c2abfca5f 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "11757" + #define REVISION_NR "11758" #endif // __REVISION_NR_H__