From 0c589c23461ce0f2aecc6061a0869e7813a480ea Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Mon, 1 Apr 2024 07:11:14 -0500
Subject: [PATCH] Interaction - Check `canInteractWith` before taking dropped
 weapons (#9783)

* Interaction - Block interaction on carried ground weapon holders

* Don't check if cargo container is claimed
---
 addons/interaction/XEH_postInit.sqf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/interaction/XEH_postInit.sqf b/addons/interaction/XEH_postInit.sqf
index 0b32daaaf0..f461e2a770 100644
--- a/addons/interaction/XEH_postInit.sqf
+++ b/addons/interaction/XEH_postInit.sqf
@@ -168,7 +168,7 @@ private _action = [
     // action display name will be overwritten in modifier function
     QGVAR(takeWeapon), "take", "\A3\ui_f\data\igui\cfg\actions\take_ca.paa",
     {_player action ["TakeWeapon", _target, weaponCargo _target select 0]},
-    {count weaponCargo _target == 1},
+    {(count weaponCargo _target == 1) && {[_player, objNull, []] call EFUNC(common,canInteractWith)}}, // Not checking if container is claimed
     nil, nil, nil, nil, nil,
     {
         params ["_target", "", "", "_actionData"];