*Merge.

--HG-- branch : trunk
2009-03-22 11:37:59 -06:00
parent ae7a8a0971 763c81de3c
commit 708449298e
4 changed files with 13 additions and 4 deletions
@@ -355,8 +355,8 @@ bool Creature::UpdateEntry(uint32 Entry, uint32 team, const CreatureData *data )
    if(isTotem() || isTrigger()
        || GetCreatureType() == CREATURE_TYPE_CRITTER)
        SetReactState(REACT_PASSIVE);
-    else if(isCivilian())
-        SetReactState(REACT_DEFENSIVE);
+    /*else if(isCivilian())
+        SetReactState(REACT_DEFENSIVE);*/
    else
        SetReactState(REACT_AGGRESSIVE);