From 25bf9d2a493796186d09f74fc7ce687f5196654b Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <paxed@alt.org>
Date: Thu, 13 Apr 2023 21:17:28 +0300
Subject: [PATCH] Prevent conflicted shopkeeper moving on top of hero

Peaceful, but conflicted, shopkeeper could move on top
of the hero, if hero was standing on the free spot inside shop.
---
 src/priest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/priest.c b/src/priest.c
index 1e737035c..8560d0c6b 100644
--- a/src/priest.c
+++ b/src/priest.c
@@ -113,7 +113,7 @@ move_special(struct monst *mtmp, boolean in_his_shop, schar appr,
             }
         }
 
-        if (MON_AT(nix, niy))
+        if (MON_AT(nix, niy) || u_at(nix, niy))
             return 0;
         remove_monster(omx, omy);
         place_monster(mtmp, nix, niy);