From 92b9db7630090a21e4bc194da4f0553d739ba5fd Mon Sep 17 00:00:00 2001
From: copperwater <aosdict@gmail.com>
Date: Mon, 12 Mar 2018 15:57:25 -0400
Subject: [PATCH] Shopkeepers are immune to peaceful displacement as well

---
 src/hack.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hack.c b/src/hack.c
index d88bd9421..103901ac5 100644
--- a/src/hack.c
+++ b/src/hack.c
@@ -1848,10 +1848,11 @@ domove_core()
                    && (!goodpos(u.ux0, u.uy0, mtmp, 0)
                        || t_at(u.ux0, u.uy0) != NULL
                        || mtmp->ispriest
+                       || mtmp->isshk
                        || mtmp->data == &mons[PM_ORACLE]
                        || mtmp->m_id == g.quest_status.leader_m_id)) {
             /* displacing peaceful into unsafe or trapped space, or trying to
-             * displace quest leader, Oracle, or priest */
+             * displace quest leader, Oracle, shopkeeper, or priest */
             You("stop.  %s doesn't want to swap places.",
                 upstart(y_monnam(mtmp)));
             didnt_move = TRUE;