From 9404b1dd7218f8bf77ec562fc458dd96c9198fce Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Sun, 9 Feb 2020 18:37:24 +0100
Subject: [PATCH] Stop wandering when destination is hidden or occupied by
 other actor

---
 apps/openmw/mwmechanics/aiwander.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/openmw/mwmechanics/aiwander.cpp b/apps/openmw/mwmechanics/aiwander.cpp
index f08c19bbd..ff213b219 100644
--- a/apps/openmw/mwmechanics/aiwander.cpp
+++ b/apps/openmw/mwmechanics/aiwander.cpp
@@ -293,6 +293,11 @@ namespace MWMechanics
             completeManualWalking(actor, storage);
         }
 
+        if (wanderState == AiWanderStorage::Wander_Walking
+            && (isDestinationHidden(actor, mPathFinder.getPath().back())
+                || isAreaOccupiedByOtherActor(actor, mPathFinder.getPath().back())))
+            completeManualWalking(actor, storage);
+
         return false; // AiWander package not yet completed
     }