From 7dfba0ae30f16eadfece002472a18d4d104a64de Mon Sep 17 00:00:00 2001
From: MiroslavR <miroslavr256@gmail.com>
Date: Mon, 1 Sep 2014 03:43:53 +0200
Subject: [PATCH] Followers with high fight should not engage in combat with
 the player

---
 apps/openmw/mwmechanics/actors.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index 3785ba9ae..0e9ebb643 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -297,7 +297,14 @@ namespace MWMechanics
         bool aggressive;
 
         if (againstPlayer) 
+        {
+            // followers with high fight should not engage in combat with the player (e.g. bm_bear_black_summon)
+            const std::list<MWWorld::Ptr>& followers = getActorsFollowing(actor2);
+            if (std::find(followers.begin(), followers.end(), actor1) != followers.end())
+                return;
+
             aggressive = MWBase::Environment::get().getMechanicsManager()->isAggressive(actor1, actor2);
+        }
         else
         {
             aggressive = false;