*Merge.

--HG-- branch : trunk
2009-05-13 19:28:55 -05:00
parent aed17ae5c3 5b9dae20b1
commit eaf0f7d44a
3 changed files with 12 additions and 1 deletions
@@ -410,7 +410,8 @@ struct TRINITY_DLL_DECL boss_alarAI : public ScriptedAI
            else
            {
                Unit *target = NULL;
-                if(Phase1 && target && (target = m_creature->SelectNearestTarget(5)))
+                target = m_creature->SelectNearestTarget(5);
+                if(Phase1 && target)
                    m_creature->AI()->AttackStart(target);
                else
                {