*Check reactstate in UpdateVictim.

--HG--
branch : trunk

5 files changed, 5 insertions, 15 deletions

diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp
index dad6fc9e0ee..6b0d5cf65fe 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_gothik.cpp
@@ -202,7 +202,7 @@ struct TRINITY_DLL_DECL boss_gothikAI : public BossAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictimByReact() || !CheckInRoom())
+        if(!UpdateVictim() || !CheckInRoom())
             return;
 
         events.Update(diff);
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp
index 3299ab85c42..1ab7c5e3334 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_noth.cpp
@@ -128,7 +128,7 @@ struct TRINITY_DLL_DECL boss_nothAI : public BossAI
 
     void UpdateAI(const uint32 diff)
     {
-        if(!UpdateVictimByReact() || !CheckInRoom())
+        if(!UpdateVictim() || !CheckInRoom())
             return;
 
         events.Update(diff);
diff --git a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp b/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp
index 9bfb98cab43..4591ea9bbd1 100644
--- a/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp
+++ b/src/bindings/scripts/scripts/zone/naxxramas/boss_sapphiron.cpp
@@ -171,7 +171,7 @@ struct TRINITY_DLL_DECL boss_sapphironAI : public BossAI
         if(!phase)
             return;
 
-        if(!UpdateVictimByReact() || !CheckInRoom())
+        if(!UpdateVictim() || !CheckInRoom())
             return;
 
         events.Update(diff);
diff --git a/src/game/CreatureAI.cpp b/src/game/CreatureAI.cpp
index 465d67ded20..e9970071f23 100644
--- a/src/game/CreatureAI.cpp
+++ b/src/game/CreatureAI.cpp
@@ -134,12 +134,12 @@ bool CreatureAI::UpdateVictimWithGaze()
     return me->getVictim();
 }
 
-bool CreatureAI::UpdateVictimByReact()
+bool CreatureAI::UpdateVictim()
 {
     if(!me->isInCombat())
         return false;
 
-    if(me->HasReactState(REACT_AGGRESSIVE))
+    if(!me->HasReactState(REACT_PASSIVE))
     {
         if(Unit *victim = me->SelectVictim())
             AttackStart(victim);
@@ -154,15 +154,6 @@ bool CreatureAI::UpdateVictimByReact()
     return true;
 }
 
-bool CreatureAI::UpdateVictim()
-{
-    if(!me->isInCombat())
-        return false;
-    if(Unit *victim = me->SelectVictim())
-        AttackStart(victim);
-    return me->getVictim();
-}
-
 bool CreatureAI::_EnterEvadeMode()
 {
     if(me->IsInEvadeMode() || !me->isAlive())
diff --git a/src/game/CreatureAI.h b/src/game/CreatureAI.h
index 6a639be74bb..d9d437c936c 100644
--- a/src/game/CreatureAI.h
+++ b/src/game/CreatureAI.h
@@ -71,7 +71,6 @@ class TRINITY_DLL_SPEC CreatureAI : public UnitAI
         Creature * const m_creature;
 
         bool UpdateVictim();
-        bool UpdateVictimByReact();
         bool UpdateVictimWithGaze();
 
         void SelectNearestTarget(Unit *who);