diff options
| author | Nay <dnpd.dd@gmail.com> | 2013-07-30 14:14:22 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2013-07-30 14:14:22 +0100 |
| commit | b21fe684c1534724130efa03086060dc2b27558b (patch) | |
| tree | e35763884692b7672b67c8f4e7c8d7fc2e91b727 /src/server/game/Spells/Spell.cpp | |
| parent | 597690ba17d4cf9b4851a88addb199cfd8ea6cfd (diff) | |
| parent | 1b0c6048484871b7ec6985783d3f29812f862f92 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
src/server/game/Spells/SpellInfo.cpp
src/server/game/Spells/SpellMgr.cpp
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 01de77ba366..3734585be03 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -825,7 +825,8 @@ void Spell::SelectEffectImplicitTargets(SpellEffIndex effIndex, SpellImplicitTar for (uint32 j = effIndex + 1; j < MAX_SPELL_EFFECTS; ++j) { SpellEffectInfo const* effects = GetSpellInfo()->Effects; - if (effects[effIndex].TargetA.GetTarget() == effects[j].TargetA.GetTarget() && + if (effects[j].IsEffect() && + effects[effIndex].TargetA.GetTarget() == effects[j].TargetA.GetTarget() && effects[effIndex].TargetB.GetTarget() == effects[j].TargetB.GetTarget() && effects[effIndex].ImplicitTargetConditions == effects[j].ImplicitTargetConditions && effects[effIndex].CalcRadius(m_caster) == effects[j].CalcRadius(m_caster) && |