Merge pull request 'develop' (#46) from develop into main

Reviewed-on: #46

CHANGELOG.md

@@ -4,12 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project badly attempts [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [4.1.2] - 2024-04-21
+## [4.1.2] - 2024-04-25
 
 ### Changed
 
 - Fix internal versioning
 - Swap resupply box 5.56 magazines due to mod conflict
+- Group deletion handler now properly processes empty groups and logs errors 
 
 ## [4.1.1] - 2024-04-19
 

framework/performance/functions/fn_addEmptyGroupCleanupPFH.sqf

@@ -10,31 +10,39 @@
 GVAR(emptyGroupCleanupPFH) = [
 	{ 
 		{
-			if (local _x) then {
-				if ((count units _x) == 0) then {
+			if ((count units _x) == 0) then {
+				if (local _x) then {
 					[
 						LEVEL_INFO,
 						QUOTE(COMPONENT),
-						format["Deleting local empty group %1", groupId _x],
-						[]
+						"DELETING EMPTY GROUP",
+						[
+							["groupId", groupId _x],
+							["netId", netId _x]
+						]
 					] call EFUNC(common,log);
 					deleteGroup _x;
-				};
-			} else {
-				if (isServer) then {
-					[
-						LEVEL_INFO,
-						QUOTE(COMPONENT),
-						format["Cannot delete group %1 as owner is %2", groupId _x, owner _x],
-						[]
-					] call EFUNC(common,log);
 				} else {
-					[
-						LEVEL_INFO,
-						QUOTE(COMPONENT),
-						format["Cannot delete group %1 as owner is %2", groupId _x, groupOwner _x],
-						[]
-					] call EFUNC(common,log);
+					if (isServer) then {
+						[
+							LEVEL_INFO,
+							QUOTE(COMPONENT),
+							"NON LOCAL EMPTY GROUP",
+ 							[
+								["groupId", groupId _x],
+								["groupOwner", groupOwner _x]
+							]
+						] call EFUNC(common,log);
+					} else {
+						[
+							LEVEL_INFO,
+							QUOTE(COMPONENT),
+							"EMPTY REMOTE GROUP",
+							[
+								["groupId", groupId _x]
+							]
+						] call EFUNC(common,log);
+					};
 				};
 			};
 		} forEach allGroups;
@@ -61,6 +69,3 @@ GVAR(emptyGroupCleanupPFH) = [
 	{ not (missionNamespace getVariable [QGVAR(emptyGroupCleanup_enable), false]) },
 	[]
 ] call CBA_fnc_createPerFrameHandlerObject;
-
-
-