2 files changed, 11 insertions, 0 deletions
diff --git a/src/game/CreatureAI.cpp b/src/game/CreatureAI.cpp
index f61aca24405..143dfec99d3 100644
--- a/src/game/CreatureAI.cpp
+++ b/src/game/CreatureAI.cpp
@@ -149,6 +149,16 @@ bool CreatureAI::UpdateVictim()
     if(!me->isInCombat())
         return false;
 
+    if(Unit *victim = me->SelectVictim())
+        AttackStart(victim);
+    return me->getVictim();
+}
+
+bool CreatureAI::UpdateCombatState()
+{
+    if(!me->isInCombat())
+        return false;
+
     if(!me->HasReactState(REACT_PASSIVE))
     {
         if(Unit *victim = me->SelectVictim())
diff --git a/src/game/CreatureAI.h b/src/game/CreatureAI.h
index d9d437c936c..91fabe30448 100644
--- a/src/game/CreatureAI.h
+++ b/src/game/CreatureAI.h
@@ -72,6 +72,7 @@ class TRINITY_DLL_SPEC CreatureAI : public UnitAI
 
         bool UpdateVictim();
         bool UpdateVictimWithGaze();
+        bool UpdateCombatState();
 
         void SelectNearestTarget(Unit *who);
     public: