*Set pvp flag for spells with SPELL_ATTR_EX3_NO_INITIAL_AGGRO if needed.

--HG--
branch : trunk

1 files changed, 3 insertions, 5 deletions

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index fe64070caea..5e0fce39f98 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -1192,11 +1192,9 @@ void Spell::DoAllEffectOnTarget(TargetInfo *target)
 
     if( !m_caster->IsFriendlyTo(unit) && !IsPositiveSpell(m_spellInfo->Id))
     {
-        if( !(m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_NO_INITIAL_AGGRO) )
-        {
-            m_caster->CombatStart(unit);
-        }
-        else if(m_customAttr & SPELL_ATTR_CU_AURA_CC)
+        m_caster->CombatStart(unit, !(m_spellInfo->AttributesEx3 & SPELL_ATTR_EX3_NO_INITIAL_AGGRO));
+
+        if(m_customAttr & SPELL_ATTR_CU_AURA_CC)
         {
             if(!unit->IsStandState())
                 unit->SetStandState(UNIT_STAND_STATE_STAND);