From 75bd6e1d2846ab1398b18778b47f392163fb6f2d Mon Sep 17 00:00:00 2001
From: Capostrophic <alexdobrohotov@yandex.ru>
Date: Tue, 14 Aug 2018 15:41:34 +0300
Subject: [PATCH] Make search for allies in actorAttacked recursive

---
 apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
index 7814b4a91e..e9915397a1 100644
--- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
+++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
@@ -1,6 +1,7 @@
 #include "mechanicsmanagerimp.hpp"
 
 #include <limits.h>
+#include <set>
 
 #include <components/misc/rng.hpp>
 
@@ -1445,11 +1446,12 @@ namespace MWMechanics
         if (target == getPlayer() || !attacker.getClass().isActor())
             return false;
 
-        std::list<MWWorld::Ptr> followersAttacker = getActorsSidingWith(attacker);
+        std::set<MWWorld::Ptr> followersAttacker;
+        getActorsSidingWith(attacker, followersAttacker);
 
         MWMechanics::CreatureStats& statsTarget = target.getClass().getCreatureStats(target);
 
-        if (std::find(followersAttacker.begin(), followersAttacker.end(), target) != followersAttacker.end())
+        if (followersAttacker.find(target) != followersAttacker.end())
         {
             statsTarget.friendlyHit();