From 78334e2be4a96fad72c00973aef15bf76b0916dd Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Tue, 5 Mar 2024 20:55:59 +0100
Subject: [PATCH] Refuel - Add ownership concept to nozzles & jerry cans
 (#9826)

Add ownership concept to nozzles & jerry cans
---
 addons/refuel/functions/fnc_canTakeNozzle.sqf         | 2 +-
 addons/refuel/functions/fnc_connectNozzleAction.sqf   | 3 +++
 addons/refuel/functions/fnc_dropNozzle.sqf            | 3 +++
 addons/refuel/functions/fnc_startNozzleInHandsPFH.sqf | 4 +---
 addons/refuel/functions/fnc_takeNozzle.sqf            | 8 +++++++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/addons/refuel/functions/fnc_canTakeNozzle.sqf b/addons/refuel/functions/fnc_canTakeNozzle.sqf
index a2dc39b815..f2fa4a6a9c 100644
--- a/addons/refuel/functions/fnc_canTakeNozzle.sqf
+++ b/addons/refuel/functions/fnc_canTakeNozzle.sqf
@@ -24,7 +24,7 @@ if (isNull _unit ||
     {!alive _object} ||
     {!isNull (_unit getVariable [QGVAR(nozzle), objNull])} || // Not already carrying a nozzle
     {(_object getVariable [QGVAR(jerryCan), false]) && {!isNull (_object getVariable [QGVAR(nozzle), objNull])}} || // Prevent jerry cans from being picked up if they have a nozzle connected
-    {typeOf _object == QGVAR(fuelNozzle) && {!isNull (attachedTo _object)}} || // Not carried by someone else
+    {!([_unit, _object, [INTERACT_EXCEPTIONS]] call EFUNC(common,canInteractWith))} || // Not carried by someone else
     {([_unit, _object] call EFUNC(interaction,getInteractionDistance)) > REFUEL_ACTION_DISTANCE}) exitWith {false};
 
 !(_object getVariable [QGVAR(isConnected), false]) && {!(_unit getVariable [QGVAR(isRefueling), false])}
diff --git a/addons/refuel/functions/fnc_connectNozzleAction.sqf b/addons/refuel/functions/fnc_connectNozzleAction.sqf
index ad658492fa..502e1dc3a4 100644
--- a/addons/refuel/functions/fnc_connectNozzleAction.sqf
+++ b/addons/refuel/functions/fnc_connectNozzleAction.sqf
@@ -116,6 +116,9 @@ private _attachPosModel = _sink worldToModel (ASLtoAGL _bestPosASL);
         // Reset fuel counter
         _source setVariable [QGVAR(fuelCounter), 0, true];
 
+        // Let other players access nozzle
+        [objNull, _nozzle] call EFUNC(common,claim);
+
         [_unit, _sink, _nozzle, _endPosTestOffset] call FUNC(refuel);
 
         private _canReceive = getNumber ((configOf _sink) >> QGVAR(canReceive)) == 1;
diff --git a/addons/refuel/functions/fnc_dropNozzle.sqf b/addons/refuel/functions/fnc_dropNozzle.sqf
index 5ca375dc29..ee37a869e1 100644
--- a/addons/refuel/functions/fnc_dropNozzle.sqf
+++ b/addons/refuel/functions/fnc_dropNozzle.sqf
@@ -24,6 +24,9 @@ TRACE_3("dropNozzle",_unit,_nozzle,_disconnectOnly);
 detach _nozzle;
 _nozzle setVariable [QGVAR(isRefueling), false, true];
 
+// Remove claim on nozzle
+[objNull, _nozzle] call EFUNC(common,claim);
+
 if (_disconnectOnly) exitWith {};
 _nozzle setVelocity [0, 0, 0];
 
diff --git a/addons/refuel/functions/fnc_startNozzleInHandsPFH.sqf b/addons/refuel/functions/fnc_startNozzleInHandsPFH.sqf
index d2f1e2aaa5..611fa85e90 100644
--- a/addons/refuel/functions/fnc_startNozzleInHandsPFH.sqf
+++ b/addons/refuel/functions/fnc_startNozzleInHandsPFH.sqf
@@ -35,11 +35,9 @@ TRACE_2("start",_unit,_nozzle);
     _args params ["_unit", "_nozzle"];
 
     if !(
-        alive _unit
+        _unit call EFUNC(common,isAwake)
         && {"" isEqualTo currentWeapon _unit || {_unit call EFUNC(common,isSwimming)}}
         && {[_unit, objNull, [INTERACT_EXCEPTIONS, "notOnMap"]] call EFUNC(common,canInteractWith)}
-        && {"unconscious" isNotEqualTo toLower animationState _unit}
-        && {!(_unit getVariable ["ACE_isUnconscious", false])}
     ) exitWith {
         TRACE_3("stop dead/weapon/interact/uncon",_unit,alive _unit,currentWeapon _unit);
         DROP_NOZZLE
diff --git a/addons/refuel/functions/fnc_takeNozzle.sqf b/addons/refuel/functions/fnc_takeNozzle.sqf
index 8eb0a16f1f..cd8f8b4eb4 100644
--- a/addons/refuel/functions/fnc_takeNozzle.sqf
+++ b/addons/refuel/functions/fnc_takeNozzle.sqf
@@ -32,17 +32,23 @@ params [
 
         private _source = _object;
         private _nozzle = _object;
-        if (typeOf _object isEqualTo QGVAR(fuelNozzle) || {_object getVariable [QGVAR(jerryCan), false]}) then { // func is called on muzzle either connected or on ground
+        if (typeOf _object isEqualTo QGVAR(fuelNozzle) || {_object getVariable [QGVAR(jerryCan), false]}) then { // func is called on nozzle either connected or on ground
             _source = _nozzle getVariable QGVAR(source);
             if (_nozzle getVariable [QGVAR(jerryCan), false]) then {
                 _nozzle attachTo [_unit, [0,1,0], "pelvis"];
             } else {
                 _nozzle attachTo [_unit, [-0.02,0.05,-0.12], "righthandmiddle1"];
             };
+
+            // Don't allow other players to take nozzle
+            [_unit, _nozzle] call EFUNC(common,claim);
         } else { // func is called on fuel truck
             _nozzle = QGVAR(fuelNozzle) createVehicle [0,0,0];
             _nozzle attachTo [_unit, [-0.02,0.05,-0.12], "righthandmiddle1"];
 
+            // Don't allow other players to take nozzle
+            [_unit, _nozzle] call EFUNC(common,claim);
+
             private _ropeTarget = _source;
             if !(_source isKindOf "AllVehicles") then {
                 private _helper = QGVAR(helper) createVehicle [0,0,0];