*Merge after backout.

--HG--
branch : trunk

1 files changed, 4 insertions, 0 deletions

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 727870f2a24..d02957bcb4e 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -1435,6 +1435,10 @@ void UnitAura::UpdateTargetMapForEffect(Unit * caster, uint8 effIndex)
                 continue;
             // add new unit to persistent area aura
             (*appIter)->_ApplyAuraEffect(this, effIndex);
+
+            // start combat with targeted enemy
+            if(GetSpellProto()->Effect[effIndex] == SPELL_EFFECT_APPLY_AREA_AURA_ENEMY)
+                GetUnitOwner()->CombatStart(*appIter);
         }
 
         itr = m_applications.find((*appIter)->GetGUID());