mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-04 21:40:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'stop_hitting_yourself' into 'master'

Browse Source 
Don't try to start combat with oneself and don't tell the player what to do

Closes #6856

See merge request OpenMW/openmw!2110
This commit is contained in:
psi29a 2022-07-06 20:46:46 +00:00
commit 7fd87ff34f
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View File

@ -1463,7 +1463,10 @@ namespace MWMechanics
std::set<MWWorld::Ptr> followersTarget;
getActorsSidingWith(target, followersTarget);
for(const auto& follower : followersTarget)
startCombat(follower, attacker);
{
if(follower != attacker && follower != player)
startCombat(follower, attacker);
}
}
}
}