From 67675d89809516f2eac079f36830b03967b5367a Mon Sep 17 00:00:00 2001
From: fgsfds <derp.primus@gmail.com>
Date: Fri, 29 Nov 2024 09:46:46 +0100
Subject: [PATCH] port: fix #541

---
 src/game/chraicommands.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/game/chraicommands.c b/src/game/chraicommands.c
index d09decd94..efcbf5ecf 100644
--- a/src/game/chraicommands.c
+++ b/src/game/chraicommands.c
@@ -2114,14 +2114,18 @@ bool aiIfGunUnclaimed(void)
 			g_Vars.aioffset += 5;
 		}
 	} else {
-		struct weaponobj *weapon = g_Vars.chrdata->gunprop->weapon;
+		struct prop *prop = g_Vars.chrdata->gunprop;
 
-		if (weapon && weapon->base.prop) {
-			weapon->base.flags |= OBJFLAG_FORCENOBOUNCE;
-			g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]);
-		} else {
-			g_Vars.aioffset += 5;
+		if (prop && prop->weapon && prop->parent == NULL && prop->type == PROPTYPE_WEAPON) {
+			struct weaponobj *weapon = prop->weapon;
+			if (weapon->base.prop) {
+				weapon->base.flags |= OBJFLAG_FORCENOBOUNCE;
+				g_Vars.aioffset = chraiGoToLabel(g_Vars.ailist, g_Vars.aioffset, cmd[4]);
+				return false;
+			}
 		}
+
+		g_Vars.aioffset += 5;
 	}
 
 	return false;