From a1db8825d4c19f7a5695735cd6794d1ea2786017 Mon Sep 17 00:00:00 2001
From: thenecromancer <none@none>
Date: Mon, 5 Apr 2010 13:15:21 +0200
Subject: Use unit target by default (script targets will send self flag
 usualy) Fixes quite some new issues like #1466

--HG--
branch : trunk
---
 src/game/Spell.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index 3e25d6a91f7..3d439558418 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -4499,13 +4499,11 @@ SpellCastResult Spell::CheckCast(bool strict)
             return SPELL_FAILED_MOVING;
     }
 
-    Unit *target;
+    Unit *target = m_targets.getUnitTarget();
 
     // In pure self-cast spells, the client won't send any unit target
-    if (m_targets.getTargetMask() == TARGET_FLAG_SELF || m_targets.getTargetMask() & TARGET_FLAG_CASTER) // TARGET_FLAG_SELF == 0, remember!
+    if (target && (m_targets.getTargetMask() == TARGET_FLAG_SELF || m_targets.getTargetMask() & TARGET_FLAG_CASTER)) // TARGET_FLAG_SELF == 0, remember!
         target = m_caster;
-    else
-        target = m_targets.getUnitTarget();
 
     if (target)
     {
-- 
cgit v1.2.3