mirror of
https://github.com/mangosfour/server.git
synced 2025-12-13 22:37:03 +00:00
[11974] Fix spell targeting for some spells like 20243
Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
This commit is contained in:
parent
f3f3349661
commit
5d445d5da9
2 changed files with 3 additions and 2 deletions
|
|
@ -448,7 +448,7 @@ void Spell::FillTargetMap()
|
||||||
{
|
{
|
||||||
// not call for empty effect.
|
// not call for empty effect.
|
||||||
// Also some spells use not used effect targets for store targets for dummy effect in triggered spells
|
// 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;
|
continue;
|
||||||
|
|
||||||
// targets for TARGET_SCRIPT_COORDINATES (A) and TARGET_SCRIPT
|
// 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
|
// 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]
|
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]))
|
&& !IsAreaAuraEffect(m_spellInfo->Effect[i]) && !IsAreaAuraEffect(m_spellInfo->Effect[j]))
|
||||||
// Add further conditions here if required
|
// Add further conditions here if required
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "11973"
|
#define REVISION_NR "11974"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue