From 1a279d5446ad1c628e28f53d78dc4b6d96728db0 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Sat, 31 Dec 2022 20:00:27 +1000
Subject: [PATCH] Fix crash relating to dangerous props

---
 src/game/chraction.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/game/chraction.c b/src/game/chraction.c
index be7ec9018..0dfea9288 100644
--- a/src/game/chraction.c
+++ b/src/game/chraction.c
@@ -10482,7 +10482,7 @@ bool chrDetectDangerousObject(struct chrdata *chr)
 		struct prop *prop = g_DangerousProps[i];
 
 		if (prop->type == PROPTYPE_EXPLOSION
-				|| (prop->weapon->weaponnum == WEAPON_GRENADE && prop->weapon->timer240 < TICKS(480))) {
+				|| (prop->weapon && prop->weapon->weaponnum == WEAPON_GRENADE && prop->weapon->timer240 < TICKS(480))) {
 			if (chrGetSquaredDistanceToCoord(chr, &prop->pos) < 1600) {
 				chr->runfrompos = g_DangerousProps[i]->pos;
 				return true;