From c0d74ba703fa38f2e86bc69e9793000577f1da85 Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Thu, 23 May 2024 21:56:08 +0200
Subject: [PATCH] Refuel - Fix fuel source disabling (#9995)

* Add enable setting

* Exclude man class init

* Fix multiplayer terrain pump fuel sync

* Add terrain pumps positions

* Add vanilla fuel cargo restoring before destroying

* Add Livonia positions by bux

* Fix terrain pumps destruction

* Improve settings init

* Fix double settings category

* Check enabled var in public functions

* Fix fnc_makeSource

* Handle recent CUP Terrains changes

* Update includes

* Fix issues introduced in #9133

* Change warning

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Optimisations and cleanup

- Use hashmaps wherever possible
- Reduced pump search radius by ~30%
- Sorted pumps alphabetically and sorted positions by "smallest" first, for consistency

* Add init debug trace

* compileScript in dev

* yoda conditions & DFUNC macro

* Wait until CBA settings are ready

* Update Chernarus 2020 and add more maps configs

* Remove vanilla fuel cargo restoring before destroying

* Update fnc_makeSource.sqf

---------

Co-authored-by: Dystopian <sddex@ya.ru>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
---
 addons/refuel/functions/fnc_makeSource.sqf | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/addons/refuel/functions/fnc_makeSource.sqf b/addons/refuel/functions/fnc_makeSource.sqf
index 30c4722377f..9d76635849f 100644
--- a/addons/refuel/functions/fnc_makeSource.sqf
+++ b/addons/refuel/functions/fnc_makeSource.sqf
@@ -40,9 +40,24 @@ TRACE_4("makeSource",_source,_fuelCargo,_hooks,_fuelCargoConfig);
 if (
     isNull _source
     || {_fuelCargo < 0 && {!(_fuelCargo in [REFUEL_INFINITE_FUEL, REFUEL_DISABLED_FUEL])}}
-    || {_fuelCargo == REFUEL_DISABLED_FUEL && {_fuelCargoConfig == REFUEL_DISABLED_FUEL}}
 ) exitWith {};
 
+// We might be removing fuel from an object that in config doesn't have fuel, but was given fuel via this function prior
+if (_fuelCargo == REFUEL_DISABLED_FUEL && {_fuelCargoConfig == REFUEL_DISABLED_FUEL}) exitWith {
+    if (isNil {_source getVariable QGVAR(currentFuelCargo)}) exitWith {};
+
+    _source setVariable [QGVAR(currentFuelCargo), nil, true];
+    _source setVariable [QGVAR(capacity), REFUEL_DISABLED_FUEL, true];
+
+    private _jipID = _source getVariable QGVAR(initSource_jipID);
+
+    if (isNil "_jipID") exitWith {};
+
+    _jipID call CBA_fnc_removeGlobalEventJIP;
+
+    _source setVariable [QGVAR(initSource_jipID), nil];
+};
+
 private _capacity = if (_fuelCargo < 0) then {_fuelCargo} else {_fuelCargoConfig max _fuelCargo};
 
 _source setVariable [QGVAR(capacity), _capacity, true];