*AI structure update.

--HG--
branch : trunk

src/bindings/scripts/include/sc_creature.cpp

@@ -63,20 +63,6 @@ void SummonList::DespawnAll()
     clear();
 }
 
-bool ScriptedAI::IsVisible(Unit* who) const
-{
-    if (!who)
-        return false;
-
-    return (m_creature->GetDistance(who) < VISIBLE_RANGE) && who->isVisibleForOrDetect(m_creature,true);
-}
-
-void ScriptedAI::MoveInLineOfSight(Unit *who)
-{
-    if(!m_creature->getVictim() && m_creature->canStartAttack(who))
-        AttackStart(who);
-}
-
 void ScriptedAI::AttackStart(Unit* who, bool melee)
 {
     if (!who)
@@ -121,7 +107,7 @@ void ScriptedAI::AttackStart(Unit* who)
 void ScriptedAI::UpdateAI(const uint32 diff)
 {
     //Check if we have a current target
-    if (m_creature->isAlive() && m_creature->SelectHostilTarget() && m_creature->getVictim())
+    if (m_creature->isAlive() && UpdateVictim())
     {
         if (m_creature->isAttackReady() )
         {

src/bindings/scripts/include/sc_creature.h

@@ -33,7 +33,7 @@ GameObject* FindGameObject(uint32 entry, float range, Unit* Finder);
 
 struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI
 {
-    ScriptedAI(Creature* creature) : m_creature(creature), InCombat(false), IsFleeing(false) {}
+    ScriptedAI(Creature* creature) : CreatureAI(creature), m_creature(creature), InCombat(false), IsFleeing(false) {}
     ~ScriptedAI() {}
 
     //*************
@@ -53,9 +53,6 @@ struct TRINITY_DLL_DECL ScriptedAI : public CreatureAI
     // Called at any Damage from any attacker (before damage apply)
     void DamageTaken(Unit *done_by, uint32 &damage) {}
 
-    //Is unit visible for MoveInLineOfSight
-    bool IsVisible(Unit *who) const;
-
     //Called at World update tick
     void UpdateAI(const uint32);
 

src/bindings/scripts/scripts/boss/boss_emeriss.cpp

@@ -60,7 +60,7 @@ struct TRINITY_DLL_DECL boss_emerissAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         //Sleep_Timer

src/bindings/scripts/scripts/boss/boss_taerar.cpp

@@ -115,7 +115,7 @@ struct TRINITY_DLL_DECL boss_taerarAI : public ScriptedAI
         }
 
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         //Sleep_Timer
@@ -259,7 +259,7 @@ struct TRINITY_DLL_DECL boss_shadeoftaerarAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         //PoisonCloud_Timer

src/bindings/scripts/scripts/boss/boss_ysondre.cpp

@@ -90,7 +90,7 @@ struct TRINITY_DLL_DECL boss_ysondreAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         //Sleep_Timer
@@ -206,7 +206,7 @@ struct TRINITY_DLL_DECL mob_dementeddruidsAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         //MoonFire_Timer

src/bindings/scripts/scripts/creature/mob_event_ai.cpp

@@ -1223,7 +1223,7 @@ struct TRINITY_DLL_DECL Mob_EventAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Check if we are in combat (also updates calls threat update code)
-        bool Combat = InCombat ? m_creature->SelectHostilTarget() : false;
+        bool Combat = InCombat ? UpdateVictim() : false;
 
         //Must return if creature isn't alive. Normally select hostil target and get victim prevent this
         if (!m_creature->isAlive())

src/bindings/scripts/scripts/creature/mob_generic_creature.cpp

@@ -77,7 +77,7 @@ struct TRINITY_DLL_DECL generic_creatureAI : public ScriptedAI
             }else BuffTimer -= diff;
 
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //If we are within range melee the target

src/bindings/scripts/scripts/creature/simple_ai.cpp

@@ -216,7 +216,7 @@ void SimpleAI::DamageTaken(Unit *killer, uint32 &damage)
 void SimpleAI::UpdateAI(const uint32 diff)
 {
     //Return since we have no target
-    if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+    if (!UpdateVictim())
         return;
 
     //Spells

src/bindings/scripts/scripts/custom/custom_example.cpp

@@ -147,7 +147,7 @@ struct TRINITY_DLL_DECL custom_exampleAI : public ScriptedAI
         }
 
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         //Spell 1 timer

src/bindings/scripts/scripts/guard/guard_ai.cpp

@@ -92,7 +92,7 @@ void guardAI::UpdateAI(const uint32 diff)
     }else BuffTimer -= diff;
 
     //Return since we have no target
-    if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+    if (!UpdateVictim())
         return;
 
     // Make sure our attack is ready and we arn't currently casting

src/bindings/scripts/scripts/guard/guards.cpp

@@ -2517,7 +2517,7 @@ struct TRINITY_DLL_DECL guard_shattrath_aldorAI : public guardAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if(!UpdateVictim())
             return;
 
         if( CanTeleport )
@@ -2713,7 +2713,7 @@ struct TRINITY_DLL_DECL guard_shattrath_scryerAI : public guardAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if(!UpdateVictim())
             return;
 
         if( CanTeleport )

src/bindings/scripts/scripts/npc/npc_escortAI.cpp

@@ -188,7 +188,7 @@ void npc_escortAI::UpdateAI(const uint32 diff)
 	}
 
     //Check if we have a current target
-    if( m_creature->isAlive() && m_creature->SelectHostilTarget() && m_creature->getVictim())
+    if( m_creature->isAlive() && UpdateVictim())
     {
         //If we are within range melee the target
         if( m_creature->IsWithinMeleeRange(m_creature->getVictim()))

src/bindings/scripts/scripts/npc/npcs_special.cpp

@@ -73,7 +73,7 @@ struct TRINITY_DLL_DECL npc_chicken_cluckAI : public ScriptedAI
             else ResetFlagTimer -= diff;
         }
 
-        if(m_creature->SelectHostilTarget() && m_creature->getVictim())
+        if(UpdateVictim())
             DoMeleeAttackIfReady();
     }
 };
@@ -611,7 +611,7 @@ struct TRINITY_DLL_DECL npc_guardianAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if (m_creature->isAttackReady())

src/bindings/scripts/scripts/zone/ashenvale_forest/ashenvale.cpp

@@ -119,7 +119,7 @@ struct TRINITY_DLL_DECL npc_torekAI : public npc_escortAI
 	{
 		npc_escortAI::UpdateAI(diff);
    
-		if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+		if (!UpdateVictim())
 			return;
    
 		if (Rend_Timer < diff)

src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_exarch_maladaar.cpp

@@ -61,7 +61,7 @@ struct TRINITY_DLL_DECL mob_stolen_soulAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if (Class_Timer < diff)
@@ -234,7 +234,7 @@ struct TRINITY_DLL_DECL boss_exarch_maladaarAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if (!Avatar_summoned && ((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() < 25))
@@ -319,7 +319,7 @@ struct TRINITY_DLL_DECL mob_avatar_of_martyredAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if (Mortal_Strike_timer < diff)

src/bindings/scripts/scripts/zone/aunchindoun/auchenai_crypts/boss_shirrak_the_dead_watcher.cpp

@@ -102,7 +102,7 @@ struct TRINITY_DLL_DECL boss_shirrak_the_dead_watcherAI : public ScriptedAI
         }else Inhibitmagic_Timer -= diff;
 
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //Attractmagic_Timer
@@ -173,7 +173,7 @@ struct TRINITY_DLL_DECL mob_focus_fireAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //FieryBlast_Timer

src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_nexusprince_shaffar.cpp

@@ -136,7 +136,7 @@ struct TRINITY_DLL_DECL boss_nexusprince_shaffarAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if( FrostNova_Timer < diff )
@@ -234,7 +234,7 @@ struct TRINITY_DLL_DECL mob_ethereal_beaconAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if( ArcaneBolt_Timer < diff )

src/bindings/scripts/scripts/zone/aunchindoun/mana_tombs/boss_pandemonius.cpp

@@ -86,7 +86,7 @@ struct TRINITY_DLL_DECL boss_pandemoniusAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if( VoidBlast_Timer < diff )

src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_darkweaver_syth.cpp

@@ -132,7 +132,7 @@ struct TRINITY_DLL_DECL boss_darkweaver_sythAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if (((m_creature->GetHealth()*100) / m_creature->GetMaxHealth() < 90) && !summon90)
@@ -228,7 +228,7 @@ struct TRINITY_DLL_DECL mob_syth_fireAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if(flameshock_timer < diff)
@@ -280,7 +280,7 @@ struct TRINITY_DLL_DECL mob_syth_arcaneAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if(arcaneshock_timer < diff)
@@ -332,7 +332,7 @@ struct TRINITY_DLL_DECL mob_syth_frostAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if(frostshock_timer < diff)
@@ -384,7 +384,7 @@ struct TRINITY_DLL_DECL mob_syth_shadowAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if(shadowshock_timer < diff)

src/bindings/scripts/scripts/zone/aunchindoun/sethekk_halls/boss_tailonking_ikiss.cpp

@@ -135,7 +135,7 @@ struct TRINITY_DLL_DECL boss_talon_king_ikissAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if (Blink)

src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp

@@ -164,7 +164,7 @@ struct TRINITY_DLL_DECL boss_ambassador_hellmawAI : public ScriptedAI
             //DoWhine("I haz no mount!", LANG_UNIVERSAL, NULL);
         }
 
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         if (CorrosiveAcid_Timer < diff)

src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp

@@ -112,7 +112,7 @@ struct TRINITY_DLL_DECL boss_blackheart_the_inciterAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         if (InciteChaos)

src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp

@@ -254,7 +254,7 @@ struct TRINITY_DLL_DECL boss_grandmaster_vorpilAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
 
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if (ShadowBoltVolley_Timer < diff)

src/bindings/scripts/scripts/zone/aunchindoun/shadow_labyrinth/boss_murmur.cpp

@@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL boss_murmurAI : public Scripted_NoMovementAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //SonicBoom_Timer

src/bindings/scripts/scripts/zone/azshara/azshara.cpp

@@ -82,7 +82,7 @@ struct TRINITY_DLL_DECL mobs_spitelashesAI : public ScriptedAI
                 DoCast(m_creature,6924);                    //visual explosion
             }
         }
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //TODO: add abilities for the different creatures

src/bindings/scripts/scripts/zone/azshara/boss_azuregos.cpp

@@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL boss_azuregosAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         if(Teleport_Timer < diff)

src/bindings/scripts/scripts/zone/azuremyst_isle/azuremyst_isle.cpp

@@ -235,7 +235,7 @@ struct TRINITY_DLL_DECL npc_engineer_spark_overgrindAI : public ScriptedAI
             }else Emote_Timer -= diff;
         }
 
-        if(!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if(!UpdateVictim())
             return;
 
         if (Dynamite_Timer < diff)

src/bindings/scripts/scripts/zone/barrens/the_barrens.cpp

@@ -148,7 +148,7 @@ struct TRINITY_DLL_DECL npc_taskmaster_fizzuleAI : public ScriptedAI
             } else Reset_Timer -= diff;
         }
 
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();

src/bindings/scripts/scripts/zone/black_temple/boss_bloodboil.cpp

@@ -198,7 +198,7 @@ struct TRINITY_DLL_DECL boss_gurtogg_bloodboilAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if(!UpdateVictim())
             return;
 
         if(ArcingSmashTimer < diff)

src/bindings/scripts/scripts/zone/black_temple/boss_illidan.cpp

@@ -694,7 +694,7 @@ struct TRINITY_DLL_DECL boss_illidan_stormrageAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if((!m_creature->SelectHostilTarget() && !m_creature->getVictim()) && Phase < PHASE_TALK_SEQUENCE)
+        if((!UpdateVictim()) && Phase < PHASE_TALK_SEQUENCE)
             return;
 
         Event = EVENT_NULL;
@@ -942,7 +942,7 @@ struct TRINITY_DLL_DECL flame_of_azzinothAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if(!UpdateVictim())
             return;
 
         if(FlameBlastTimer < diff)
@@ -1353,7 +1353,7 @@ struct TRINITY_DLL_DECL npc_akama_illidanAI : public ScriptedAI
             }
         }
 
-        if(!m_creature->SelectHostilTarget() && !m_creature->getVictim())
+        if(!UpdateVictim())
             return;
 
         if(m_creature->GetHealth()*100 / m_creature->GetMaxHealth() < 20)
@@ -1494,7 +1494,7 @@ struct TRINITY_DLL_DECL boss_maievAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if((!m_creature->SelectHostilTarget() || !m_creature->getVictim()) 
+        if((!UpdateVictim()) 
             && !Timer[EVENT_MAIEV_STEALTH])
             return;
 
@@ -1697,7 +1697,7 @@ struct TRINITY_DLL_DECL shadow_demonAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!m_creature->SelectHostilTarget() && !m_creature->getVictim()) return;
+        if(!UpdateVictim()) return;
 
         if(m_creature->getVictim()->GetTypeId() != TYPEID_PLAYER) return; // Only cast the below on players.
 

src/bindings/scripts/scripts/zone/black_temple/boss_mother_shahraz.cpp

@@ -170,7 +170,7 @@ struct TRINITY_DLL_DECL boss_shahrazAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if(!UpdateVictim())
             return;
 
         if(((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 10) && !Enraged)

src/bindings/scripts/scripts/zone/black_temple/boss_reliquary_of_souls.cpp

@@ -397,7 +397,7 @@ struct TRINITY_DLL_DECL boss_essence_of_sufferingAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() && !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         //Supposed to be cast on nearest target
@@ -491,7 +491,7 @@ struct TRINITY_DLL_DECL boss_essence_of_desireAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() && !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if(RuneShieldTimer < diff)
@@ -580,7 +580,7 @@ struct TRINITY_DLL_DECL boss_essence_of_angerAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() && !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if(!CheckedAggro)

src/bindings/scripts/scripts/zone/black_temple/boss_shade_of_akama.cpp

@@ -748,7 +748,7 @@ struct TRINITY_DLL_DECL npc_akamaAI : public ScriptedAI
                 }
             }else SoulRetrieveTimer -= diff;
 
-        if(!m_creature->getVictim() || !m_creature->SelectHostilTarget())
+        if(!UpdateVictim())
             return;
 
         if(DestructivePoisonTimer < diff)

src/bindings/scripts/scripts/zone/black_temple/boss_supremus.cpp

@@ -148,7 +148,7 @@ struct TRINITY_DLL_DECL boss_supremusAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if(!m_creature->HasAura(SPELL_BERSERK, 0))

src/bindings/scripts/scripts/zone/black_temple/boss_teron_gorefiend.cpp

@@ -89,7 +89,7 @@ struct TRINITY_DLL_DECL mob_doom_blossomAI : public ScriptedAI
             CheckTeronTimer = 5000;
         }else CheckTeronTimer -= diff;
 
-        if(!m_creature->getVictim() || !m_creature->SelectHostilTarget())
+        if(!UpdateVictim())
             return;
 
         if(ShadowBoltTimer < diff)
@@ -390,7 +390,7 @@ struct TRINITY_DLL_DECL boss_teron_gorefiendAI : public ScriptedAI
             }else AggroTimer -= diff;
         }
 
-        if(!m_creature->SelectHostilTarget() || !m_creature->getVictim() || Intro)
+        if(!UpdateVictim() || Intro)
             return;
 
         if(SummonShadowsTimer < diff)

src/bindings/scripts/scripts/zone/black_temple/boss_warlord_najentus.cpp

@@ -132,7 +132,7 @@ struct TRINITY_DLL_DECL boss_najentusAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if(TidalShieldTimer < diff)

src/bindings/scripts/scripts/zone/black_temple/illidari_council.cpp

@@ -325,7 +325,7 @@ struct TRINITY_DLL_DECL mob_illidari_councilAI : public ScriptedAI
                         if(Creature* Member = ((Creature*)Unit::GetUnit((*m_creature), Council[i])))
                         {
                             // This is the evade/death check.
-                            if(Member->isAlive() && !Member->SelectHostilTarget())
+                            if(Member->isAlive() && !Member->getVictim())
                                 ++EvadeCheck;                   //If all members evade, we reset so that players can properly reset the event
                             else if(!Member->isAlive())         // If even one member dies, kill the rest, set instance data, and kill self.
                             {
@@ -490,7 +490,7 @@ struct TRINITY_DLL_DECL boss_gathios_the_shattererAI : public boss_illidari_coun
 
     void UpdateAI(const uint32 diff)
     {
-        if(!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if(!UpdateVictim())
             return;
 
         if(BlessingTimer < diff)
@@ -578,7 +578,7 @@ struct TRINITY_DLL_DECL boss_high_nethermancer_zerevorAI : public boss_illidari_
 
     void UpdateAI(const uint32 diff)
     {
-        if(!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if(!UpdateVictim())
             return;
 
         if(Cooldown)
@@ -666,7 +666,7 @@ struct TRINITY_DLL_DECL boss_lady_malandeAI : public boss_illidari_councilAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if(!UpdateVictim())
             return;
 
         if(EmpoweredSmiteTimer < diff)
@@ -740,7 +740,7 @@ struct TRINITY_DLL_DECL boss_veras_darkshadowAI : public boss_illidari_councilAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if(!UpdateVictim())
             return;
 
         if(!HasVanished)

src/bindings/scripts/scripts/zone/blackrock_depths/blackrock_depths.cpp

@@ -360,7 +360,7 @@ struct TRINITY_DLL_DECL mob_phalanxAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if(!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if(!UpdateVictim() )
             return;
 
         //ThunderClap_Timer

src/bindings/scripts/scripts/zone/blackrock_depths/boss_ambassador_flamelash.cpp

@@ -67,7 +67,7 @@ struct TRINITY_DLL_DECL boss_ambassador_flamelashAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //FireBlast_Timer

src/bindings/scripts/scripts/zone/blackrock_depths/boss_anubshiah.cpp

@@ -55,7 +55,7 @@ struct TRINITY_DLL_DECL boss_anubshiahAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //ShadowBolt_Timer

src/bindings/scripts/scripts/zone/blackrock_depths/boss_emperor_dagran_thaurissan.cpp

@@ -57,7 +57,7 @@ struct TRINITY_DLL_DECL boss_draganthaurissanAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         if (HandOfThaurissan_Timer < diff)

src/bindings/scripts/scripts/zone/blackrock_depths/boss_general_angerforge.cpp

@@ -103,7 +103,7 @@ struct TRINITY_DLL_DECL boss_general_angerforgeAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //MightyBlow_Timer

src/bindings/scripts/scripts/zone/blackrock_depths/boss_gorosh_the_dervish.cpp

@@ -46,7 +46,7 @@ struct TRINITY_DLL_DECL boss_gorosh_the_dervishAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //WhirlWind_Timer

src/bindings/scripts/scripts/zone/blackrock_depths/boss_grizzle.cpp

@@ -46,7 +46,7 @@ struct TRINITY_DLL_DECL boss_grizzleAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //GroundTremor_Timer

src/bindings/scripts/scripts/zone/blackrock_depths/boss_high_interrogator_gerstahn.cpp

@@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL boss_high_interrogator_gerstahnAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //ShadowWordPain_Timer

src/bindings/scripts/scripts/zone/blackrock_depths/boss_magmus.cpp

@@ -46,7 +46,7 @@ struct TRINITY_DLL_DECL boss_magmusAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //FieryBurst_Timer

src/bindings/scripts/scripts/zone/blackrock_depths/boss_moira_bronzebeard.cpp

@@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_moira_bronzebeardAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //MindBlast_Timer

src/bindings/scripts/scripts/zone/blackrock_depths/boss_tomb_of_seven.cpp

@@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL boss_angerrelAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         //SunderArmor_Timer
@@ -110,7 +110,7 @@ struct TRINITY_DLL_DECL boss_doperelAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         //SinisterStrike_Timer
@@ -170,7 +170,7 @@ struct TRINITY_DLL_DECL boss_haterelAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         //ShadowBolt_Timer
@@ -242,7 +242,7 @@ struct TRINITY_DLL_DECL boss_vilerelAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         //MindBlast_Timer
@@ -315,7 +315,7 @@ struct TRINITY_DLL_DECL boss_seethrelAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         //FrostArmor_Timer
@@ -391,7 +391,7 @@ struct TRINITY_DLL_DECL boss_gloomrelAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //Hamstring_Timer
@@ -520,7 +520,7 @@ struct TRINITY_DLL_DECL boss_doomrelAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //ShadowVolley_Timer

src/bindings/scripts/scripts/zone/blackrock_spire/boss_drakkisath.cpp

@@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL boss_drakkisathAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //FireNova_Timer

src/bindings/scripts/scripts/zone/blackrock_spire/boss_gyth.cpp

@@ -96,7 +96,7 @@ struct TRINITY_DLL_DECL boss_gythAI : public ScriptedAI
         //char buf[200];
 
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         if (!RootSelf)

src/bindings/scripts/scripts/zone/blackrock_spire/boss_halycon.cpp

@@ -53,7 +53,7 @@ struct TRINITY_DLL_DECL boss_halyconAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //CrowdPummel_Timer

src/bindings/scripts/scripts/zone/blackrock_spire/boss_highlord_omokk.cpp

@@ -61,7 +61,7 @@ struct TRINITY_DLL_DECL boss_highlordomokkAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //WarStomp_Timer

src/bindings/scripts/scripts/zone/blackrock_spire/boss_mother_smolderweb.cpp

@@ -51,7 +51,7 @@ struct TRINITY_DLL_DECL boss_mothersmolderwebAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //Crystalize_Timer

src/bindings/scripts/scripts/zone/blackrock_spire/boss_overlord_wyrmthalak.cpp

@@ -65,7 +65,7 @@ struct TRINITY_DLL_DECL boss_overlordwyrmthalakAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //BlastWave_Timer

src/bindings/scripts/scripts/zone/blackrock_spire/boss_pyroguard_emberseer.cpp

@@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL boss_pyroguard_emberseerAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //FireNova_Timer

src/bindings/scripts/scripts/zone/blackrock_spire/boss_quartermaster_zigris.cpp

@@ -50,7 +50,7 @@ struct TRINITY_DLL_DECL boss_quatermasterzigrisAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //Shoot_Timer

src/bindings/scripts/scripts/zone/blackrock_spire/boss_rend_blackhand.cpp

@@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL boss_rend_blackhandAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //WhirlWind_Timer

src/bindings/scripts/scripts/zone/blackrock_spire/boss_shadow_hunter_voshgajin.cpp

@@ -51,7 +51,7 @@ struct TRINITY_DLL_DECL boss_shadowvoshAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //CurseOfBlood_Timer

src/bindings/scripts/scripts/zone/blackrock_spire/boss_the_beast.cpp

@@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL boss_thebeastAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //Flamebreak_Timer

src/bindings/scripts/scripts/zone/blackrock_spire/boss_warmaster_voone.cpp

@@ -58,7 +58,7 @@ struct TRINITY_DLL_DECL boss_warmastervooneAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //Snapkick_Timer

src/bindings/scripts/scripts/zone/blackwing_lair/boss_broodlord_lashlayer.cpp

@@ -61,7 +61,7 @@ struct TRINITY_DLL_DECL boss_broodlordAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         //LeashCheck_Timer

src/bindings/scripts/scripts/zone/blackwing_lair/boss_chromaggus.cpp

@@ -189,7 +189,7 @@ struct TRINITY_DLL_DECL boss_chromaggusAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //Shimmer_Timer Timer

src/bindings/scripts/scripts/zone/blackwing_lair/boss_ebonroc.cpp

@@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL boss_ebonrocAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //Shadowflame Timer

src/bindings/scripts/scripts/zone/blackwing_lair/boss_firemaw.cpp

@@ -49,7 +49,7 @@ struct TRINITY_DLL_DECL boss_firemawAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //ShadowFlame_Timer

src/bindings/scripts/scripts/zone/blackwing_lair/boss_flamegor.cpp

@@ -51,7 +51,7 @@ struct TRINITY_DLL_DECL boss_flamegorAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //ShadowFlame_Timer

src/bindings/scripts/scripts/zone/blackwing_lair/boss_nefarian.cpp

@@ -112,7 +112,7 @@ struct TRINITY_DLL_DECL boss_nefarianAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //ShadowFlame_Timer

src/bindings/scripts/scripts/zone/blackwing_lair/boss_razorgore.cpp

@@ -67,7 +67,7 @@ struct TRINITY_DLL_DECL boss_razorgoreAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //Cleave_Timer

src/bindings/scripts/scripts/zone/blackwing_lair/boss_vaelastrasz.cpp

@@ -142,7 +142,7 @@ struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI
         }
 
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         // Yell if hp lower than 15%

src/bindings/scripts/scripts/zone/blackwing_lair/boss_victor_nefarius.cpp

@@ -221,7 +221,7 @@ struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //Only do this if we haven't spawned nef yet

src/bindings/scripts/scripts/zone/blades_edge_mountains/blades_edge_mountains.cpp

@@ -226,7 +226,7 @@ struct TRINITY_DLL_DECL mobs_nether_drakeAI : public ScriptedAI
             return;                                         //anything below here is not interesting for Nihil, so skip it
         }
 
-        if( !m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if( !UpdateVictim() )
             return;
 
         if( IntangiblePresence_Timer <= diff )

src/bindings/scripts/scripts/zone/blasted_lands/boss_kruul.cpp

@@ -93,7 +93,7 @@ struct TRINITY_DLL_DECL boss_kruulAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //ShadowVolley_Timer

src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_aeonus.cpp

@@ -104,7 +104,7 @@ struct TRINITY_DLL_DECL boss_aeonusAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //Sand Breath

src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp

@@ -99,7 +99,7 @@ struct TRINITY_DLL_DECL boss_chrono_lord_dejaAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //Arcane Blast

src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/boss_temporus.cpp

@@ -102,7 +102,7 @@ struct TRINITY_DLL_DECL boss_temporusAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         //Attack Haste

src/bindings/scripts/scripts/zone/caverns_of_time/dark_portal/dark_portal.cpp

@@ -213,7 +213,7 @@ struct TRINITY_DLL_DECL npc_medivh_bmAI : public ScriptedAI
 			}else Check_Timer -= diff;
 		}
 	 	 
-		//if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+		//if (!UpdateVictim())
 		//return;
 	 	 
 		//DoMeleeAttackIfReady();

src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/boss_archimonde.cpp

@@ -256,7 +256,7 @@ struct TRINITY_DLL_DECL mob_doomfire_targettingAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if(!UpdateVictim())
             return;
 
         if(SummonTimer < diff)
@@ -574,7 +574,7 @@ struct TRINITY_DLL_DECL boss_archimondeAI : public ScriptedAI
             }else DrainNordrassilTimer -= diff;
         }
 
-        if(!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if(!UpdateVictim())
             return;
 
         if(((m_creature->GetHealth()*100 / m_creature->GetMaxHealth()) < 10) && !BelowTenPercent && !Enraged)

src/bindings/scripts/scripts/zone/caverns_of_time/hyjal/hyjalAI.cpp

@@ -433,7 +433,7 @@ void hyjalAI::UpdateAI(const uint32 diff)
         CheckTimer = 5000;
     }else CheckTimer -= diff;
 
-    if(!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+    if(!UpdateVictim())
         return;
 
     for(uint8 i = 0; i < 3; ++i)

src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp

@@ -92,7 +92,7 @@ struct TRINITY_DLL_DECL boss_captain_skarlocAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //Holy_Light

src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp

@@ -92,7 +92,7 @@ struct TRINITY_DLL_DECL boss_epoch_hunterAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //Sand Breath

src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp

@@ -144,7 +144,7 @@ struct TRINITY_DLL_DECL boss_lieutenant_drakeAI : public ScriptedAI
         }
 
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         //Whirlwind

src/bindings/scripts/scripts/zone/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp

@@ -495,7 +495,7 @@ struct TRINITY_DLL_DECL npc_thrall_old_hillsbradAI : public npc_escortAI
     {
         npc_escortAI::UpdateAI(diff);
 
-		if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+		if (!UpdateVictim())
 			return;
 
              //TODO: add his abilities'n-crap here

src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp

@@ -232,7 +232,7 @@ struct TRINITY_DLL_DECL boss_fathomlord_karathressAI : public ScriptedAI
         }
 
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //someone evaded!
@@ -381,7 +381,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_sharkkisAI : public ScriptedAI
         }
 
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //someone evaded!
@@ -512,7 +512,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_tidalvessAI : public ScriptedAI
         }
 
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //someone evaded!
@@ -627,7 +627,7 @@ struct TRINITY_DLL_DECL boss_fathomguard_caribdisAI : public ScriptedAI
         }
 
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //someone evaded!

src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp

@@ -223,7 +223,7 @@ struct TRINITY_DLL_DECL boss_hydross_the_unstableAI : public ScriptedAI
 			beam=true;
 		}
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         // corrupted form

src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp

@@ -342,7 +342,7 @@ struct TRINITY_DLL_DECL boss_lady_vashjAI : public ScriptedAI
 			return;
 		}
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         if(Phase == 1 || Phase == 3)

src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp

@@ -113,7 +113,7 @@ struct TRINITY_DLL_DECL mob_inner_demonAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
 		if (m_creature->getVictim()->GetGUID() != victimGUID)
@@ -403,7 +403,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blindAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (m_creature->HasAura(AURA_BANISH, 0) || !m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (m_creature->HasAura(AURA_BANISH, 0) || !UpdateVictim())
 		{
 			if(BanishTimer<diff)
 			{
@@ -626,7 +626,7 @@ struct TRINITY_DLL_DECL boss_leotheras_the_blind_demonformAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
         //ChaosBlast_Timer
 		if(m_creature->GetDistance(m_creature->getVictim()) < 30)
@@ -723,7 +723,7 @@ struct TRINITY_DLL_DECL mob_greyheart_spellbinderAI : public ScriptedAI
 			}
 		}
 		
-		if(!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+		if(!UpdateVictim())
 		{
 			CastChanneling();
 			return;

src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp

@@ -249,7 +249,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI
 	 void UpdateAI(const uint32 diff)
 	 {
 		 //Return since we have no target
-		 if (!m_creature->SelectHostilTarget() /*|| !m_creature->getVictim()*/ )//rotate resets target
+		 if (!UpdateVictim() /*|| !m_creature->getVictim()*/ )//rotate resets target
 			 return;
 
 		  //Check if players in water and if in water cast spell
@@ -328,7 +328,7 @@ struct TRINITY_DLL_DECL boss_the_lurker_belowAI : public Scripted_NoMovementAI
 				 WaterboltTimer = 3000;
 			 }else WaterboltTimer -= diff;
 
-			 if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+			 if (!UpdateVictim() )
 				return;
 
 			 DoMeleeAttackIfReady();

src/bindings/scripts/scripts/zone/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp

@@ -183,7 +183,7 @@ struct TRINITY_DLL_DECL boss_morogrim_tidewalkerAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //Earthquake_Timer
@@ -326,7 +326,7 @@ struct TRINITY_DLL_DECL mob_water_globuleAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         if (Check_Timer < diff)

src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp

@@ -99,7 +99,7 @@ struct TRINITY_DLL_DECL boss_thespiaAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         //LightningCloud_Timer
@@ -158,7 +158,7 @@ struct TRINITY_DLL_DECL mob_coilfang_waterelementalAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if (WaterBoltVolley_Timer < diff)

src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp

@@ -127,7 +127,7 @@ struct TRINITY_DLL_DECL boss_mekgineer_steamriggerAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if (Shrink_Timer < diff)
@@ -252,7 +252,7 @@ struct TRINITY_DLL_DECL mob_steamrigger_mechanicAI : public ScriptedAI
             }else Repair_Timer = 5000;
         }else Repair_Timer -= diff;
 
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         DoMeleeAttackIfReady();

src/bindings/scripts/scripts/zone/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp

@@ -174,7 +174,7 @@ struct TRINITY_DLL_DECL boss_warlord_kalithreshAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         if (Rage_Timer < diff)

src/bindings/scripts/scripts/zone/coilfang_resevoir/underbog/boss_hungarfen.cpp

@@ -52,7 +52,7 @@ struct TRINITY_DLL_DECL boss_hungarfenAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if( (m_creature->GetHealth()*100) / m_creature->GetMaxHealth() <= 20 )

src/bindings/scripts/scripts/zone/dustwallow_marsh/dustwallow_marsh.cpp

@@ -63,7 +63,7 @@ struct TRINITY_DLL_DECL mobs_risen_husk_spiritAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if( ConsumeFlesh_Timer < diff )

src/bindings/scripts/scripts/zone/eversong_woods/eversong_woods.cpp

@@ -282,7 +282,7 @@ struct TRINITY_DLL_DECL npc_secondTrialAI : public ScriptedAI
          else timer -= diff;
       }
 
-      if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+      if (!UpdateVictim())
           return;
 
       // healer
@@ -400,7 +400,7 @@ struct TRINITY_DLL_DECL master_kelerun_bloodmournAI : public ScriptedAI
          else timer -= diff;
       }
 
-      if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+      if (!UpdateVictim())
           return;
 
       DoMeleeAttackIfReady();

src/bindings/scripts/scripts/zone/gruuls_lair/boss_gruul.cpp

@@ -132,7 +132,7 @@ struct TRINITY_DLL_DECL boss_gruulAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         // Growth

src/bindings/scripts/scripts/zone/gruuls_lair/boss_high_king_maulgar.cpp

@@ -200,7 +200,7 @@ struct TRINITY_DLL_DECL boss_high_king_maulgarAI : public ScriptedAI
         }
 
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //someone evaded!
@@ -329,7 +329,7 @@ struct TRINITY_DLL_DECL boss_olm_the_summonerAI : public ScriptedAI
         }
 
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //someone evaded!
@@ -431,7 +431,7 @@ struct TRINITY_DLL_DECL boss_kiggler_the_crazedAI : public ScriptedAI
         }
 
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //someone evaded!
@@ -535,7 +535,7 @@ struct TRINITY_DLL_DECL boss_blindeye_the_seerAI : public ScriptedAI
         }
 
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //someone evaded!
@@ -624,7 +624,7 @@ struct TRINITY_DLL_DECL boss_krosh_firehandAI : public ScriptedAI
         }
 
         //Return since we have no target
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim() )
+        if (!UpdateVictim() )
             return;
 
         //someone evaded!

src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_broggok.cpp

@@ -54,7 +54,7 @@ struct TRINITY_DLL_DECL boss_broggokAI : public ScriptedAI
     void UpdateAI(const uint32 diff)
     {
 
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if(AcidSpray_Timer < diff)

src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp

@@ -188,7 +188,7 @@ struct TRINITY_DLL_DECL boss_kelidan_the_breakerAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
         {
             if(check_Timer < diff)
             {
@@ -309,7 +309,7 @@ struct TRINITY_DLL_DECL mob_shadowmoon_channelerAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
         {
             if(check_Timer < diff)
             {

src/bindings/scripts/scripts/zone/hellfire_citadel/blood_furnace/boss_the_maker.cpp

@@ -78,7 +78,7 @@ struct TRINITY_DLL_DECL boss_the_makerAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if (AcidSpray_Timer < diff)

src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp

@@ -111,7 +111,7 @@ struct TRINITY_DLL_DECL boss_omor_the_unscarredAI : public Scripted_NoMovementAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         //only two may be wrong, perhaps increase timer and spawn periodically instead.

src/bindings/scripts/scripts/zone/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp

@@ -107,7 +107,7 @@ struct TRINITY_DLL_DECL boss_nazanAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
         {
             if(UnsummonCheck < diff && m_creature->isAlive())
             {
@@ -220,7 +220,7 @@ struct TRINITY_DLL_DECL boss_vazrudenAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
         {
             if(UnsummonCheck < diff && m_creature->isAlive())
             {
@@ -430,7 +430,7 @@ struct TRINITY_DLL_DECL mob_hellfire_sentryAI : public ScriptedAI
 
     void UpdateAI(const uint32 diff)
     {
-        if (!m_creature->SelectHostilTarget() || !m_creature->getVictim())
+        if (!UpdateVictim())
             return;
 
         if(KidneyShot_Timer < diff)