Skip to content

Commit 7ec362b

Browse files
committed
Cleanup
1 parent 01292b8 commit 7ec362b

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

apps/openmw/mwmechanics/mechanicsmanagerimp.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1571,9 +1571,8 @@ namespace MWMechanics
15711571
const MWWorld::Class& cls = target.getClass();
15721572
const MWMechanics::CreatureStats& stats = cls.getCreatureStats(target);
15731573
const MWMechanics::AiSequence& seq = stats.getAiSequence();
1574-
return cls.isNpc() && !attacker.isEmpty() && !seq.isInCombat(attacker) && !isAggressive(target, attacker)
1575-
&& !seq.isEngagedWithActor() && !stats.getAiSequence().isInPursuit()
1576-
&& !cls.getNpcStats(target).isWerewolf()
1574+
return cls.isNpc() && !attacker.isEmpty() && !isAggressive(target, attacker) && !seq.isEngagedWithActor()
1575+
&& !stats.getAiSequence().isInPursuit() && !cls.getNpcStats(target).isWerewolf()
15771576
&& stats.getMagicEffects().getOrDefault(ESM::MagicEffect::Vampirism).getMagnitude() <= 0;
15781577
}
15791578

0 commit comments

Comments
 (0)