diff options
| author | megamage <none@none> | 2009-04-22 17:52:01 -0500 |
|---|---|---|
| committer | megamage <none@none> | 2009-04-22 17:52:01 -0500 |
| commit | e7e03d167e9ea2fa2d29b240b9597fb0a1c3b160 (patch) | |
| tree | e0418fa21c12ce9b57fea8f6d4ca3215990f7489 /src/bindings/scripts | |
| parent | 1cd8ea8c1abbb1b110a0af36b60ec9d17c608da3 (diff) | |
| parent | dc326fdf2cd1320d07a65dcfaf3c9761d71489e0 (diff) | |
*Merge.
--HG--
branch : trunk
Diffstat (limited to 'src/bindings/scripts')
2 files changed, 9 insertions, 3 deletions
diff --git a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp index 6c64a255370..719e6f32eff 100644 --- a/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp +++ b/src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp @@ -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); diff --git a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp index b8c6162a809..3f4c2d5b62c 100644 --- a/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp +++ b/src/bindings/scripts/scripts/zone/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp @@ -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); |