mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-02-04 03:40:14 +00:00
Merge branch 'more_single_character_changes' into 'master'
Fix inverted logic II Closes #6772 See merge request OpenMW/openmw!1929
This commit is contained in:
commit
2f8a5fdc55
@ -971,7 +971,7 @@ namespace MWMechanics
|
||||
const auto mechanicsManager = MWBase::Environment::get().getMechanicsManager();
|
||||
const auto world = MWBase::Environment::get().getWorld();
|
||||
|
||||
if (actorClass.isClass(ptr, "Guard") && creatureStats.getAiSequence().isInPursuit() && !creatureStats.getAiSequence().isInCombat()
|
||||
if (actorClass.isClass(ptr, "Guard") && !creatureStats.getAiSequence().isInPursuit() && !creatureStats.getAiSequence().isInCombat()
|
||||
&& creatureStats.getMagicEffects().get(ESM::MagicEffect::CalmHumanoid).getMagnitude() == 0)
|
||||
{
|
||||
const MWWorld::ESMStore& esmStore = world->getStore();
|
||||
|
Loading…
x
Reference in New Issue
Block a user