*Creatures with the same faction should always be friendly to each other. This fix the bug that creatures with the same faction fight earch other.

*Allow "chain effect" when creatures call assistance.

--HG--
branch : trunk

1 files changed, 9 insertions, 3 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index 83ad2b51b1c..642b49ee99a 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -8486,10 +8486,16 @@ void Unit::CombatStart(Unit* target)
 
     if(!target->isInCombat() && target->GetTypeId() != TYPEID_PLAYER
         && ((Creature*)target)->isAggressive() && ((Creature*)target)->AI())
+    {
+        SetInCombatWith(target);
+        target->SetInCombatWith(this);
         ((Creature*)target)->AI()->AttackStart(this);
-
-    SetInCombatWith(target);
-    target->SetInCombatWith(this);
+    }
+    else
+    {
+        SetInCombatWith(target);
+        target->SetInCombatWith(this);
+    }
 
     if(Player* attackedPlayer = target->GetCharmerOrOwnerPlayerOrPlayerItself())
         SetContestedPvP(attackedPlayer);