From: Pasi Kallinen <paxed@alt.org>
Date: Fri, 11 Oct 2019 17:24:17 +0000 (+0300)
Subject: Fix priests and shopkeepers moving on other monsters
X-Git-Tag: v3.6.3.757eca7~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=46adb312e748d3ede72a134f763ba5b4f3d62b52;p=nethack

Fix priests and shopkeepers moving on other monsters
---

diff --git a/doc/fixes36.3 b/doc/fixes36.3
index 32a45e720..2fdd04027 100644
--- a/doc/fixes36.3
+++ b/doc/fixes36.3
@@ -180,6 +180,7 @@ avoid 'object lost' panic when polymorph causes loss of levitation boots or
 fix exploding land mine moving ball or chain and causing a sanity error
 fix firing attached iron ball when swallowed causing a sanity error
 fix vault guard impossible when he could not relocate in certain situation
+fix temple priests or shopkeepers moving over other monsters
 
 
 Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository
diff --git a/src/priest.c b/src/priest.c
index d97886c73..ab20a8d7a 100644
--- a/src/priest.c
+++ b/src/priest.c
@@ -118,6 +118,8 @@ pick_move:
     }
 
     if (nix != omx || niy != omy) {
+        if (MON_AT(nix, niy))
+            return 0;
         remove_monster(omx, omy);
         place_monster(mtmp, nix, niy);
         newsym(nix, niy);