From f017b964adbce89b7f898beb39b19b55ffa9a5dd Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Fri, 16 Jan 2009 19:37:47 -0600
Subject: *Only let aggressive creature search new target before
 enterevademode.

--HG--
branch : trunk
---
 src/game/Unit.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src')

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;
+            }
         }
     }
 
-- 
cgit v1.2.3