From dc0ba385670830f7e80beb451acf4b2f9a84ccec Mon Sep 17 00:00:00 2001
From: IndigoFox <indigo@indigofox.dev>
Date: Sat, 29 Apr 2023 08:35:01 -0700
Subject: [PATCH] check modDir to allow rename

---
 @RangerMetrics/addons/RangerMetrics/config.cpp      |  6 ++----
 .../captureDefinitions/fn_server_missionEH.sqf      | 13 ++++++++-----
 .../RangerMetrics/functions/core/fn_postInit.sqf    |  2 ++
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/@RangerMetrics/addons/RangerMetrics/config.cpp b/@RangerMetrics/addons/RangerMetrics/config.cpp
index d7a4d21..43c4ef4 100644
--- a/@RangerMetrics/addons/RangerMetrics/config.cpp
+++ b/@RangerMetrics/addons/RangerMetrics/config.cpp
@@ -18,7 +18,7 @@ class CfgFunctions {
 		};
 	};
 	class RangerMetrics_event {
-		class functions {
+		class server {
 			file = "\RangerMetrics\functions\capture\serverEH";
 			class ace_unconscious {};
 			class EntityKilled {};
@@ -30,9 +30,7 @@ class CfgFunctions {
 			class MarkerUpdated {};
 			class milsim_serverEfficiency {};
 		};
-	};
-	class RangerMetrics_event {
-		class functions {
+		class client {
 			file = "\RangerMetrics\functions\capture\clientEH";
 		};
 	};
diff --git a/@RangerMetrics/addons/RangerMetrics/functions/captureDefinitions/fn_server_missionEH.sqf b/@RangerMetrics/addons/RangerMetrics/functions/captureDefinitions/fn_server_missionEH.sqf
index 662cd09..0672818 100644
--- a/@RangerMetrics/addons/RangerMetrics/functions/captureDefinitions/fn_server_missionEH.sqf
+++ b/@RangerMetrics/addons/RangerMetrics/functions/captureDefinitions/fn_server_missionEH.sqf
@@ -2,11 +2,14 @@
 	["OnUserConnected", {
 		params ["_networkId", "_clientStateNumber", "_clientState"];
 		private _userInfo = (getUserInfo _networkId);
-		_userInfo call RangerMetrics_capture_fnc_player_identity;
-		_userInfo call RangerMetrics_capture_fnc_player_status;
-		["server_events", "OnUserConnected", [
-			["string", "playerUID", _userInfo#2]
-		], [
+		private _tags = [];
+		if (!isNil "_userInfo") then {
+			_tags pushBack ["string", "playerUID", _userInfo#2];
+			_userInfo call RangerMetrics_capture_fnc_player_identity;
+			_userInfo call RangerMetrics_capture_fnc_player_status;
+		};
+		["server_events", "OnUserConnected",
+		_tags, [
 			["string", "networkId", _networkId],
 			["int", "clientStateNumber", _clientStateNumber],
 			["string", "clientState", _clientState]
diff --git a/@RangerMetrics/addons/RangerMetrics/functions/core/fn_postInit.sqf b/@RangerMetrics/addons/RangerMetrics/functions/core/fn_postInit.sqf
index 66ddae5..79ae9ac 100644
--- a/@RangerMetrics/addons/RangerMetrics/functions/core/fn_postInit.sqf
+++ b/@RangerMetrics/addons/RangerMetrics/functions/core/fn_postInit.sqf
@@ -28,6 +28,8 @@ addMissionEventHandler [
     RangerMetrics_callback_fnc_callbackHandler
 ];
 
+"RangerMetrics" callExtension ["setAddonDir", [configSourceMod (configFile >> "CfgPatches" >> "RangerMetrics")]];
+
 // Deinit to start fresh. See callback handler for the remainder of async init code
 "RangerMetrics" callExtension "deinitExtension";