diff --git a/doc/fixes34.1 b/doc/fixes34.1 index 37e7b3841..858321972 100644 --- a/doc/fixes34.1 +++ b/doc/fixes34.1 @@ -46,6 +46,8 @@ cannot trip over submerged objects if you're water walking wand of striking was not identified if it activated a statue trap cannot sacrifice while you're swallowed player polymorphed into an eel cannot drown breathless/amphibious monsters +avoid dmonsfree impossible message due to migrating a dead monster via + mhurtle causing the monster to end up in a hole or other trap Platform- and/or Interface-Specific Fixes diff --git a/src/uhitm.c b/src/uhitm.c index 929bb9f25..c41083403 100644 --- a/src/uhitm.c +++ b/src/uhitm.c @@ -896,7 +896,9 @@ int thrown; if (jousting) { You("joust %s%s", mon_nam(mon), canseemon(mon) ? exclam(tmp) : "."); - mhurtle(mon, u.dx, u.dy, 1); + /* avoid migrating a dead monster */ + if (mon->mhp > tmp) + mhurtle(mon, u.dx, u.dy, 1); hittxt = TRUE; } else #endif @@ -908,7 +910,9 @@ int thrown; if (canspotmon(mon)) pline("%s %s from your powerful strike!", Monnam(mon), makeplural(stagger(mon->data, "stagger"))); - mhurtle(mon, u.dx, u.dy, 1); + /* avoid migrating a dead monster */ + if (mon->mhp > tmp) + mhurtle(mon, u.dx, u.dy, 1); hittxt = TRUE; } }