From 069f19f5c8827a643b8e39bca1a4bcdbe1b11e3a Mon Sep 17 00:00:00 2001
From: LinkIsGrim <salluci.lovi@gmail.com>
Date: Thu, 19 Oct 2023 19:52:12 -0400
Subject: [PATCH] remove actions from scripted holders

---
 addons/dragging/CfgEventHandlers.hpp |  7 +++++++
 addons/interaction/CfgVehicles.hpp   | 21 +++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/addons/dragging/CfgEventHandlers.hpp b/addons/dragging/CfgEventHandlers.hpp
index 94ebf2cda64..d3b43b314a2 100644
--- a/addons/dragging/CfgEventHandlers.hpp
+++ b/addons/dragging/CfgEventHandlers.hpp
@@ -42,6 +42,13 @@ class Extended_Init_EventHandlers {
     class WeaponHolder {
         class ADDON {
             init = QUOTE(_this call FUNC(initObject));
+            exclude[] = {"GroundWeaponHolder_Scripted"};
+        };
+    };
+    class WeaponHolderSimulated {
+        class ADDON {
+            init = QUOTE(_this call FUNC(initObject));
+            exclude[] = {"WeaponHolderSimulated_Scripted"};
         };
     };
     class Land_Camping_Light_F {
diff --git a/addons/interaction/CfgVehicles.hpp b/addons/interaction/CfgVehicles.hpp
index 57753dfaff5..e19a8c25024 100644
--- a/addons/interaction/CfgVehicles.hpp
+++ b/addons/interaction/CfgVehicles.hpp
@@ -715,6 +715,14 @@ class CfgVehicles {
             };
         };
     };
+    // Don't enable for scripted
+    class WeaponHolderSimulated_Scripted: WeaponHolderSimulated {
+        class ACE_Actions: ACE_Actions {
+            class ACE_MainActions: ACE_MainActions {
+                delete GVAR(Gear);
+            };
+        };
+    };
 
     class ReammoBox;
     // dropped weapons/gear
@@ -733,6 +741,19 @@ class CfgVehicles {
             };
         };
     };
+    // Don't enable for scripted
+    class GroundWeaponHolder: WeaponHolder {
+        class ACE_Actions: ACE_Actions {
+            class ACE_MainActions;
+        };
+    };
+    class GroundWeaponHolder_Scripted: GroundWeaponHolder {
+        class ACE_Actions: ACE_Actions {
+            class ACE_MainActions: ACE_MainActions {
+                delete GVAR(Gear);
+            };
+        };
+    };
 
     class Lamps_base_F;
     class Land_PortableLight_single_F: Lamps_base_F {