Unclaim, then claim

acemod · Jan 12, 2025 · befdcc2 · befdcc2
1 parent c49a82a
commit befdcc2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/addons/sitting/functions/fnc_sit.sqf b/addons/sitting/functions/fnc_sit.sqf
@@ -94,9 +94,15 @@ private _seatDistOrig = (getPosASL _player) distance _seat;
         _seatsClaimed set [_seatPos, objNull];
         _seat setVariable [QGVAR(seatsClaimed), _seatsClaimed, true];
 
-        // Unclaim if no one else sitting on it, but pass ownership if someone remains
-        private _newOwner = _seatsClaimed param [_seatsClaimed findIf {!isNull _x}, objNull];
-        [_newOwner, _seat] call EFUNC(common,claim);
+        // Unclaim...
+        [objNull, _seat] call EFUNC(common,claim);
+
+        // ...but have a remaining unit reclaim ownership immediately
+        private _index = _seatsClaimed findIf {!isNull _x};
+
+        if (_index == -1) exitWith {};
+
+        [_seatsClaimed select _index, _seat] call EFUNC(common,claim);
     };
 
     // Stand up if chair gets deleted or moved

diff --git a/addons/sitting/functions/fnc_stand.sqf b/addons/sitting/functions/fnc_stand.sqf
@@ -46,6 +46,12 @@ private _seatsClaimed = _seat getVariable [QGVAR(seatsClaimed), []];
 _seatsClaimed set [_seatPos, objNull];
 _seat setVariable [QGVAR(seatsClaimed), _seatsClaimed, true];
 
-// Unclaim if no one else sitting on it, but pass ownership if someone remains
-private _newOwner = _seatsClaimed param [_seatsClaimed findIf {!isNull _x}, objNull];
-[_newOwner, _seat] call EFUNC(common,claim);
+// Unclaim...
+[objNull, _seat] call EFUNC(common,claim);
+
+// ...but have a remaining unit reclaim ownership immediately
+private _index = _seatsClaimed findIf {!isNull _x};
+
+if (_index == -1) exitWith {};
+
+[_seatsClaimed select _index, _seat] call EFUNC(common,claim);