From 412653308e1b0bf920de2e73967939c31f118766 Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Tue, 26 Mar 2024 08:24:01 +0100
Subject: [PATCH 1/2] Warn users about duplicate loadout validation

---
 addons/headless/XEH_postInit.sqf | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/addons/headless/XEH_postInit.sqf b/addons/headless/XEH_postInit.sqf
index 103d5c18342..b8d42fc58eb 100644
--- a/addons/headless/XEH_postInit.sqf
+++ b/addons/headless/XEH_postInit.sqf
@@ -10,6 +10,23 @@
             };
             // Add disconnect EH
             addMissionEventHandler ["HandleDisconnect", {call FUNC(handleDisconnect)}];
+
+            // If CBA's loadout validation is enabled, warn users
+            if (XGVAR(transferLoadout) > 0 && {(missionNamespace getVariable ["CBA_network_loadoutValidation", 0]) isEqualTo 2}) then {
+                WARNING("CBA_network_loadoutValidation is enabled - acex_headless_transferLoadout should therefore be disabled");
+                [QEGVAR(common,displayTextStructured), ["CBA_network_loadoutValidation is enabled - acex_headless_transferLoadout should therefore be disabled", 4]] call CBA_fnc_globalEvent;
+            };
+
+            ["CBA_SettingChanged", {
+                params ["_setting", "_value"];
+
+                if (_setting != "CBA_network_loadoutValidation") exitWith {};
+
+                if (XGVAR(transferLoadout) > 0 && {_value isEqualTo 2}) then {
+                    WARNING("CBA_network_loadoutValidation is enabled - acex_headless_transferLoadout should therefore be disabled");
+                    [QEGVAR(common,displayTextStructured), ["CBA_network_loadoutValidation is enabled - acex_headless_transferLoadout should therefore be disabled", 4]] call CBA_fnc_globalEvent;
+                };
+            }] call CBA_fnc_addEventHandler;
         } else {
             // Register HC (this part happens on HC only)
             [QXGVAR(headlessClientJoined), [player]] call CBA_fnc_globalEvent; // Global event for API purposes

From 4b90ac83c3880170301ee5ff499c82e1b50f6eb0 Mon Sep 17 00:00:00 2001
From: johnb432 <58661205+johnb432@users.noreply.github.com>
Date: Tue, 26 Mar 2024 20:33:22 +0100
Subject: [PATCH 2/2] Update XEH_postInit.sqf

---
 addons/headless/XEH_postInit.sqf | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/addons/headless/XEH_postInit.sqf b/addons/headless/XEH_postInit.sqf
index b8d42fc58eb..28363b4221b 100644
--- a/addons/headless/XEH_postInit.sqf
+++ b/addons/headless/XEH_postInit.sqf
@@ -1,5 +1,7 @@
 #include "script_component.hpp"
 
+if (!isMultiplayer) exitWith {};
+
 ["ace_settingsInitialized", {
     // Register and remove HCs if not client that is not server and distribution or end mission enabled
     if ((!hasInterface || isServer) && {XGVAR(enabled) || XGVAR(endMission) != 0}) then {
@@ -14,7 +16,7 @@
             // If CBA's loadout validation is enabled, warn users
             if (XGVAR(transferLoadout) > 0 && {(missionNamespace getVariable ["CBA_network_loadoutValidation", 0]) isEqualTo 2}) then {
                 WARNING("CBA_network_loadoutValidation is enabled - acex_headless_transferLoadout should therefore be disabled");
-                [QEGVAR(common,displayTextStructured), ["CBA_network_loadoutValidation is enabled - acex_headless_transferLoadout should therefore be disabled", 4]] call CBA_fnc_globalEvent;
+                [QEGVAR(common,displayTextStructured), ["CBA_network_loadoutValidation is enabled - acex_headless_transferLoadout should therefore be disabled", 3]] call CBA_fnc_globalEvent;
             };
 
             ["CBA_SettingChanged", {
@@ -24,7 +26,7 @@
 
                 if (XGVAR(transferLoadout) > 0 && {_value isEqualTo 2}) then {
                     WARNING("CBA_network_loadoutValidation is enabled - acex_headless_transferLoadout should therefore be disabled");
-                    [QEGVAR(common,displayTextStructured), ["CBA_network_loadoutValidation is enabled - acex_headless_transferLoadout should therefore be disabled", 4]] call CBA_fnc_globalEvent;
+                    [QEGVAR(common,displayTextStructured), ["CBA_network_loadoutValidation is enabled - acex_headless_transferLoadout should therefore be disabled", 3]] call CBA_fnc_globalEvent;
                 };
             }] call CBA_fnc_addEventHandler;
         } else {