Fix priests and shopkeepers moving on other monsters

diff --git a/doc/fixes36.3 b/doc/fixes36.3
index 32a45e720e4e7009d81855da655b2b59860edc85..2fdd04027fa365a9938186aa7b23fe211c1aae63 100644 (file)
--- 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 d97886c73b0fa84ab503641f602c27bd8a3a4b0b..ab20a8d7a611c4aec626df352b87880eacfb9467 100644 (file)
--- 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);