aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/game/GridNotifiersImpl.h4
-rw-r--r--src/game/SpellAuras.cpp3
2 files changed, 7 insertions, 0 deletions
diff --git a/src/game/GridNotifiersImpl.h b/src/game/GridNotifiersImpl.h
index 5f4fe8cb05b..a43a97cd898 100644
--- a/src/game/GridNotifiersImpl.h
+++ b/src/game/GridNotifiersImpl.h
@@ -190,11 +190,15 @@ inline void Trinity::DynamicObjectUpdater::VisitHelper(Unit* target)
{
if (i_check->IsFriendlyTo( target ))
return;
+
+ i_check->CombatStart(target);
}
else
{
if (!i_check->IsHostileTo( target ))
return;
+
+ i_check->CombatStart(target);
}
// Check target immune to spell or aura
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 4b868812b16..80ac2165a30 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -658,6 +658,9 @@ void AreaAura::Update(uint32 diff)
else
aur = new AreaAura(actualSpellInfo, m_effIndex, NULL, (*tIter), caster, NULL);
(*tIter)->AddAura(aur);
+
+ if(m_areaAuraType == AREA_AURA_ENEMY)
+ caster->CombatStart(*tIter);
}
}
}