From 8d1eb7e2e6a72f04c2e15e4816009121366d885c Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 4 Jul 2021 03:15:40 +0200
Subject: [PATCH] Fix slow AiPackage::getTarget calls
Assume there are no cell refs with empty ref id.
---
CHANGELOG.md | 1 +
apps/openmw/mwmechanics/aipackage.cpp | 5 +++++
2 files changed, 6 insertions(+)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b508d518d7..60de6d6d57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -143,6 +143,7 @@
Bug #6036: OpenMW-CS: Terrain selection at the border of cells omits certain corner vertices
Bug #6043: Actor can have torch missing when torch animation is played
Bug #6047: Mouse bindings can be triggered during save loading
+ Bug #6136: Game freezes when NPCs try to open doors that are about to be closed
Feature #390: 3rd person look "over the shoulder"
Feature #832: OpenMW-CS: Handle deleted references
Feature #1536: Show more information about level on menu
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 5239491795..8ad9447514 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -55,6 +55,11 @@ MWWorld::Ptr MWMechanics::AiPackage::getTarget() const
if (mTargetActorId == -1)
{
+ if (mTargetActorRefId.empty())
+ {
+ mTargetActorId = -2;
+ return MWWorld::Ptr();
+ }
MWWorld::Ptr target = MWBase::Environment::get().getWorld()->searchPtr(mTargetActorRefId, false);
if (target.isEmpty())
{