*Merge.

--HG-- branch : trunk
2009-04-23 21:44:48 -05:00
parent 84e9ffb487 e97ddc5872
commit bd56af1294
2 changed files with 3 additions and 2 deletions
@@ -1573,7 +1573,8 @@ bool Creature::IsWithinSightDist(Unit const* u) const

 bool Creature::canStartAttack(Unit const* who) const
 {
-    if(!who->isInAccessiblePlaceFor(this)
+    if(isCivilian()
+        || !who->isInAccessiblePlaceFor(this)
        || !canFly() && GetDistanceZ(who) > CREATURE_Z_ATTACK_RANGE
        || !IsWithinDistInMap(who, GetAttackDistance(who)))
        return false;