diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp index 6727be51b..2e1dfbac5 100644 --- a/apps/openmw/mwmechanics/aicombat.cpp +++ b/apps/openmw/mwmechanics/aicombat.cpp @@ -229,6 +229,9 @@ namespace MWMechanics osg::Vec3f vAimDir = MWBase::Environment::get().getWorld()->aimToTarget(actor, target); float distToTarget = MWBase::Environment::get().getWorld()->getHitDistance(actor, target); + if (!currentAction) + return; + storage.mReadyToAttack = (currentAction->isAttackingOrSpell() && distToTarget <= rangeAttack); // can't fight if attacker can't go where target is. E.g. A fish can't attack person on land.