From d442af0fad0c0530a57acf2f1a724117267f972b Mon Sep 17 00:00:00 2001
From: Hourier <66951241+Hourier@users.noreply.github.com>
Date: Tue, 21 Nov 2023 19:16:21 +0900
Subject: [PATCH] =?utf8?q?[Fix]=20#3747=20=E3=83=88=E3=83=A9=E3=83=83?=
 =?utf8?q?=E3=83=97=E4=BB=98=E3=81=AE=E7=AE=B1=E3=82=92=E9=96=8B=E3=81=91?=
 =?utf8?q?=E3=81=9F=E6=99=82=E3=80=81=E7=AE=B1=E3=81=8C=E7=A0=B4=E6=90=8D?=
 =?utf8?q?=E3=81=99=E3=82=8B=E5=87=A6=E7=90=86=E3=81=A8=E4=B8=AD=E3=81=AE?=
 =?utf8?q?=E3=82=A2=E3=82=A4=E3=83=86=E3=83=A0=E3=82=92=E5=8F=96=E3=82=8A?=
 =?utf8?q?=E5=87=BA=E3=81=99=E5=87=A6=E7=90=86=E3=81=8C=E7=AB=B6=E5=90=88?=
 =?utf8?q?=E3=81=97=E3=81=A6=E3=82=AF=E3=83=A9=E3=83=83=E3=82=B7=E3=83=A5?=
 =?utf8?q?=E3=81=99=E3=82=8B=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92=E8=A7=A3?=
 =?utf8?q?=E6=B6=88=E3=81=97=E3=81=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

箱は破損しているので中のアイテムは取り出せないものとする
---
 src/specific-object/chest.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/specific-object/chest.cpp b/src/specific-object/chest.cpp
index ac1c759d9..5fbff7fc5 100644
--- a/src/specific-object/chest.cpp
+++ b/src/specific-object/chest.cpp
@@ -58,6 +58,10 @@ void Chest::chest_death(bool scatter, POSITION y, POSITION x, OBJECT_IDX o_idx)
     BIT_FLAGS mode = AM_GOOD | AM_FORBID_CHEST;
     auto *floor_ptr = this->player_ptr->current_floor_ptr;
     auto *o_ptr = &floor_ptr->o_list[o_idx];
+    if (!o_ptr->is_valid()) {
+        msg_print(_("箱は既に壊れてしまっている…", "The chest was broken and you couldn't open it..."));
+        return;
+    }
 
     /* Small chests often hold "gold" */
     const auto sval = *o_ptr->bi_key.sval();
-- 
2.11.0