*Only let aggressive creature search new target before enterevademode.

--HG--
branch : trunk

1 files changed, 7 insertions, 4 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 734182fa4cf..28a34dd7dea 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -10411,12 +10411,15 @@ bool Unit::SelectHostilTarget()
     }
 
     // search nearby enemy before enter evade mode
-    if(Unit *target = ((Creature*)this)->SelectNearestTarget())
+    if(((Creature*)target)->HasReactState(REACT_AGGRESSIVE))
     {
-        if(!((Creature*)this)->IsOutOfThreatArea(target))
+        if(Unit *target = ((Creature*)this)->SelectNearestTarget())
         {
-            ((Creature*)this)->AI()->AttackStart(target);
-            return true;
+            if(!((Creature*)this)->IsOutOfThreatArea(target))
+            {
+                ((Creature*)this)->AI()->AttackStart(target);
+                return true;
+            }
         }
     }