From 623e77dbefbd75c00d1939b142b6853ac8c1afed Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Wed, 17 Jul 2024 13:56:37 +0200
Subject: [PATCH] Unload ViV before dragging/carrying

---
 addons/dragging/functions/fnc_carryObject.sqf | 5 +++++
 addons/dragging/functions/fnc_dragObject.sqf  | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/addons/dragging/functions/fnc_carryObject.sqf b/addons/dragging/functions/fnc_carryObject.sqf
index 4d5ac8b61b..29c807b894 100644
--- a/addons/dragging/functions/fnc_carryObject.sqf
+++ b/addons/dragging/functions/fnc_carryObject.sqf
@@ -19,6 +19,11 @@
 params ["_unit", "_target"];
 TRACE_2("params",_unit,_target);
 
+// If in ViV cargo, unload it first
+if (!isNull isVehicleCargo _target) then {
+    objNull setVehicleCargo _target;
+};
+
 // Get attachTo offset and direction
 private _position = _target getVariable [QGVAR(carryPosition), [0, 0, 0]];
 private _direction = _target getVariable [QGVAR(carryDirection), 0];
diff --git a/addons/dragging/functions/fnc_dragObject.sqf b/addons/dragging/functions/fnc_dragObject.sqf
index 5116f440b3..58631cdc5c 100644
--- a/addons/dragging/functions/fnc_dragObject.sqf
+++ b/addons/dragging/functions/fnc_dragObject.sqf
@@ -19,6 +19,11 @@
 params ["_unit", "_target"];
 TRACE_2("params",_unit,_target);
 
+// If in ViV cargo, unload it first
+if (!isNull isVehicleCargo _target) then {
+    objNull setVehicleCargo _target;
+};
+
 // Get attachTo offset and direction.
 private _position = _target getVariable [QGVAR(dragPosition), [0, 0, 0]];
 private _direction = _target getVariable [QGVAR(dragDirection), 0];