From d591ebaa46dd727edbf10f10b99c61f30e498756 Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <paxed@alt.org>
Date: Fri, 29 Jan 2016 16:59:21 +0200
Subject: [PATCH] Fix bz58: Inheritance dispute between shk and risen undead

Prevent shopkeeper from "gratefully inheriting all your possessions"
when your corpse rises as undead.
---
 src/shk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shk.c b/src/shk.c
index b2208d399..ff9f8a44c 100644
--- a/src/shk.c
+++ b/src/shk.c
@@ -1722,7 +1722,7 @@ int croaked;
     /* shopkeeper is peaceful, nothing stolen, nothing owed. */
     if (roomno == eshkp->shoproom && inhishop(shkp) && !eshkp->billct
         && !eshkp->robbed && !eshkp->debit && NOTANGRY(shkp)
-        && !eshkp->following) {
+        && !eshkp->following && u.ugrave_arise < LOW_PM) {
         taken = (invent != 0);
         if (taken)
             pline("%s gratefully inherits all your possessions.",
-- 
2.50.1