1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-04-02 10:06:40 +00:00

Merge branch 'safely_on_the_other_side_of_the_door' into 'master'

End combat when the target is outside the active grid

See merge request OpenMW/openmw!2619
This commit is contained in:
psi29a 2023-01-15 19:00:03 +00:00
commit ea91d861ef

View file

@ -112,7 +112,7 @@ namespace MWMechanics
MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtrViaActorId(mTargetActorId);
if (target.isEmpty())
return false;
return true;
if (!target.getRefData().getCount()
|| !target.getRefData().isEnabled() // Really we should be checking whether the target is currently