Merge branch 'fightthechameleon' into 'master'

Prevent witnesses from ending combat because they didn't get hit

See merge request OpenMW/openmw!4814
This commit is contained in:
psi29a 2025-07-29 07:43:59 +00:00
commit b937b0271f

View File

@ -1453,6 +1453,7 @@ namespace MWMechanics
} }
startCombat(actor, player, &playerFollowers); startCombat(actor, player, &playerFollowers);
observerStats.setHitAttemptActorId(player.getClass().getCreatureStats(player).getActorId());
// Apply aggression value to the base Fight rating, so that the actor can continue fighting // Apply aggression value to the base Fight rating, so that the actor can continue fighting
// after a Calm spell wears off // after a Calm spell wears off