[12202] Improve target selection for TARGET_DUELVSPLAYER

Also set the spell to be Redirected only if the spell is actually redirected
mokerjoke · Sep 9, 2012 · 57082b8 · 57082b8
1 parent d51c1ca
commit 57082b8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
@@ -2581,19 +2581,21 @@ void Spell::SetTargetMap(SpellEffectIndex effIndex, uint32 targetMode, UnitList&
             break;
         case TARGET_DUELVSPLAYER:
         {
-            Unit* target = m_targets.getUnitTarget();
-            if (target)
+            if (Unit* target = m_targets.getUnitTarget())
             {
                 if (m_caster->IsFriendlyTo(target))
                 {
                     targetUnitMap.push_back(target);
                 }
                 else
                 {
-                    if (Unit* pUnitTarget = m_caster->SelectMagnetTarget(m_targets.getUnitTarget(), this, effIndex))
+                    if (Unit* pUnitTarget = m_caster->SelectMagnetTarget(target, this, effIndex))
                     {
-                        m_targets.setUnitTarget(pUnitTarget);
-                        m_spellFlags |= SPELL_FLAG_REDIRECTED;
+                        if (target != pUnitTarget)
+                        {
+                            m_targets.setUnitTarget(pUnitTarget);
+                            m_spellFlags |= SPELL_FLAG_REDIRECTED;
+                        }
                         targetUnitMap.push_back(pUnitTarget);
                     }
                 }

diff --git 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 "12201"
+ #define REVISION_NR "12202"
 #endif // __REVISION_NR_H__