From e42d63f4a40c8a942dfed16b4b8f6a2d6ea56531 Mon Sep 17 00:00:00 2001 From: Evil Eye Date: Wed, 6 Jul 2022 19:12:36 +0200 Subject: [PATCH] Don't try to start combat with oneself and don't tell the player what to do --- apps/openmw/mwmechanics/mechanicsmanagerimp.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp index f20381ea91..95842330f8 100644 --- a/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp +++ b/apps/openmw/mwmechanics/mechanicsmanagerimp.cpp @@ -1463,7 +1463,10 @@ namespace MWMechanics std::set followersTarget; getActorsSidingWith(target, followersTarget); for(const auto& follower : followersTarget) - startCombat(follower, attacker); + { + if(follower != attacker && follower != player) + startCombat(follower, attacker); + } } } }