*Merge.

--HG-- branch : trunk
2009-04-04 13:11:03 -06:00
parent b858dd535a 19f725cd51
commit e53521d228
12 changed files with 133 additions and 79 deletions
@@ -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