From 7811c89a93ea1608043c404b2173bf80155050a0 Mon Sep 17 00:00:00 2001
From: linencloth <none@none>
Date: Sat, 13 Nov 2010 23:51:23 +0100
Subject: Core/MovementGenerators: Don't remove evade state when clearing unit
 states. Core/Spells: Don't start combat when the target is evading. Closes
 issue 1861

--HG--
branch : trunk
---
 src/server/game/Spells/Spell.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/server/game/Spells/Spell.cpp')

diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp
index 9ce3d89a99d..07a11fa9842 100755
--- a/src/server/game/Spells/Spell.cpp
+++ b/src/server/game/Spells/Spell.cpp
@@ -1321,7 +1321,7 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
         }
     }
 
-    if (m_caster && !m_caster->IsFriendlyTo(unit) && !IsPositiveSpell(m_spellInfo->Id))
+    if (missInfo != SPELL_MISS_EVADE && m_caster && !m_caster->IsFriendlyTo(unit) && !IsPositiveSpell(m_spellInfo->Id))
     {
         m_caster->CombatStart(unit, !(m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_NO_INITIAL_AGGRO));
 
-- 
cgit v1.2.3