*Merge.
--HG-- branch : trunk
This commit is contained in:
+6
@@ -166,6 +166,12 @@ struct TRINITY_DLL_DECL boss_ambassador_hellmawAI : public ScriptedAI
|
||||
if (!UpdateVictim() )
|
||||
return;
|
||||
|
||||
if(m_creature->HasAura(SPELL_BANISH, 0))
|
||||
{
|
||||
EnterEvadeMode();
|
||||
return;
|
||||
}
|
||||
|
||||
if (CorrosiveAcid_Timer < diff)
|
||||
{
|
||||
DoCast(m_creature->getVictim(),SPELL_CORROSIVE_ACID);
|
||||
|
||||
+3
-3
@@ -187,7 +187,7 @@ struct TRINITY_DLL_DECL boss_warbringer_omroggAI : public ScriptedAI
|
||||
Unit *Left = Unit::GetUnit(*m_creature,LeftHead);
|
||||
Unit *Right = Unit::GetUnit(*m_creature,RightHead);
|
||||
|
||||
if (!Left && !Right)
|
||||
if (!Left || !Right)
|
||||
return;
|
||||
|
||||
ithreat = rand()%4;
|
||||
@@ -240,7 +240,7 @@ struct TRINITY_DLL_DECL boss_warbringer_omroggAI : public ScriptedAI
|
||||
Unit *Left = Unit::GetUnit(*m_creature,LeftHead);
|
||||
Unit *Right = Unit::GetUnit(*m_creature,RightHead);
|
||||
|
||||
if (!Left && !Right)
|
||||
if (!Left || !Right)
|
||||
return;
|
||||
|
||||
ikilling = rand()%2;
|
||||
@@ -269,7 +269,7 @@ struct TRINITY_DLL_DECL boss_warbringer_omroggAI : public ScriptedAI
|
||||
Unit *Left = Unit::GetUnit(*m_creature,LeftHead);
|
||||
Unit *Right = Unit::GetUnit(*m_creature,RightHead);
|
||||
|
||||
if (!Left && !Right)
|
||||
if (!Left || !Right)
|
||||
return;
|
||||
|
||||
DoScriptText(YELL_DIE_L, Left);
|
||||
|
||||
Reference in New Issue
Block a user