From cae20175c3406668a6aeac81e08c11441735a104 Mon Sep 17 00:00:00 2001
From: PatR <rankin@nethack.org>
Date: Sun, 4 Feb 2024 17:20:21 -0800
Subject: [PATCH] fix "It stole <item>" if hero teleports to safety

Having an item that allowed being in/on water/lava be stolen could
result in the hero teleporting.  If the thief wasn't visible from
hero's new location, the message given was "It stole <whatever>."

Save the thief's name/description before removing the item and
potentially dropping hero into trouble and triggering teleport, then
use that in the eventual message.
---
 src/steal.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/steal.c b/src/steal.c
index 29999de41..80d33ab3d 100644
--- a/src/steal.c
+++ b/src/steal.c
@@ -312,6 +312,7 @@ int
 steal(struct monst* mtmp, char* objnambuf)
 {
     struct obj *otmp;
+    char Monnambuf[BUFSZ];
     int tmp, could_petrify, armordelay, olddelay, icnt,
         named = 0, retrycnt = 0;
     boolean monkey_business, /* true iff an animal is doing the thievery */
@@ -394,6 +395,13 @@ steal(struct monst* mtmp, char* objnambuf)
     if (otmp->o_id == gs.stealoid)
         return 0;
 
+    /* stealing a worn item might drop hero into water or lava where
+       teleporting to safety could result in a previously visible thief
+       no longer being visible; remember the name in order to avoid "It"
+       in the eventual "<Monnam> stole <item>" message; (the name might
+       already be "It"; if so, that's ok) */
+    Strcpy(Monnambuf, Monnam(mtmp));
+
     if (otmp->otyp == BOULDER && !throws_rocks(mtmp->data)) {
         if (!retrycnt++)
             goto retry;
@@ -420,7 +428,7 @@ steal(struct monst* mtmp, char* objnambuf)
             static const char *const how[] = { "steal", "snatch", "grab",
                                                "take" };
  cant_take:
-            pline("%s tries to %s %s%s but gives up.", Monnam(mtmp),
+            pline("%s tries to %s %s%s but gives up.", Monnambuf,
                   ROLL_FROM(how),
                   (otmp->owornmask & W_ARMOR) ? "your " : "",
                   (otmp->owornmask & W_ARMOR) ? equipname(otmp)
@@ -474,7 +482,7 @@ steal(struct monst* mtmp, char* objnambuf)
                 slowly = (armordelay >= 1 || gm.multi < 0);
                 if (flags.female)
                     urgent_pline("%s charms you.  You gladly %s your %s.",
-                                 !seen ? "She" : Monnam(mtmp),
+                                 !seen ? "She" : Monnambuf,
                                  curssv ? "let her take"
                                  : !slowly ? "hand over"
                                    : was_doffing ? "continue removing"
@@ -523,7 +531,7 @@ steal(struct monst* mtmp, char* objnambuf)
         subfrombill(otmp, shop_keeper(*u.ushops));
     freeinv(otmp);
     /* if attached ball was taken, uball and uchain are now Null */
-    urgent_pline("%s%s stole %s.", named ? "She" : Monnam(mtmp),
+    urgent_pline("%s%s stole %s.", named ? "She" : Monnambuf,
                  (was_punished && !Punished) ? " removed your chain and" : "",
                  doname(otmp));
     (void) encumber_msg();