1 files changed, 15 insertions, 1 deletions
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index 337fc4102..ed9e4ae38 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -937,7 +937,21 @@ impHandler0(talk)
 {
     if (player_node)
     {
-        Being *const target = player_node->getTarget();
+        Being *target = player_node->getTarget();
+        if (!target)
+        {
+            target = actorSpriteManager->findNearestLivingBeing(
+                player_node, 1, ActorSprite::NPC);
+            // ignore closest target if distance in each direction more than 1
+            if (target)
+            {
+                if (abs(target->getTileX() - player_node->getTileX()) > 1
+                || abs(target->getTileY() - player_node->getTileY()) > 1)
+                {
+                    return true;
+                }
+            }
+        }
         if (target)
         {
             if (target->canTalk())