From 5d445d5da92c97f02fc04e598255684c57c80256 Mon Sep 17 00:00:00 2001 From: Reamer Date: Sun, 22 Apr 2012 22:08:11 +0200 Subject: [PATCH] [11974] Fix spell targeting for some spells like 20243 Signed-off-by: Schmoozerd --- src/game/Spell.cpp | 3 ++- src/shared/revision_nr.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 5cb696b36..86aa0afb3 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -448,7 +448,7 @@ void Spell::FillTargetMap() { // not call for empty effect. // Also some spells use not used effect targets for store targets for dummy effect in triggered spells - if (m_spellInfo->Effect[i] == 0) + if (m_spellInfo->Effect[i] == SPELL_EFFECT_NONE) continue; // targets for TARGET_SCRIPT_COORDINATES (A) and TARGET_SCRIPT @@ -470,6 +470,7 @@ void Spell::FillTargetMap() { // Check if same target, but handle i.e. AreaAuras different if (m_spellInfo->EffectImplicitTargetA[i] == m_spellInfo->EffectImplicitTargetA[j] && m_spellInfo->EffectImplicitTargetB[i] == m_spellInfo->EffectImplicitTargetB[j] + && m_spellInfo->Effect[j] != SPELL_EFFECT_NONE && !IsAreaAuraEffect(m_spellInfo->Effect[i]) && !IsAreaAuraEffect(m_spellInfo->Effect[j])) // Add further conditions here if required { diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 0f714e7e6..e4a189644 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 "11973" + #define REVISION_NR "11974" #endif // __REVISION_NR_H__