From a209843caafb966d1e1f03920cd876db06e36304 Mon Sep 17 00:00:00 2001 From: IndigoFox Date: Tue, 18 Apr 2023 00:02:32 -0700 Subject: [PATCH] fix bugs found during testing --- .../functions/callbackHandlers/fn_loadSettings.sqf | 4 ++-- .../capture/EHOnly/fn_milsim_serverEfficiency.sqf | 10 +++++----- .../functions/capture/fn_player_performance.sqf | 4 +++- .../captureDefinitions/fn_server_missionEH.sqf | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/@RangerMetrics/addons/RangerMetrics/functions/callbackHandlers/fn_loadSettings.sqf b/@RangerMetrics/addons/RangerMetrics/functions/callbackHandlers/fn_loadSettings.sqf index 4278eab..d78a667 100644 --- a/@RangerMetrics/addons/RangerMetrics/functions/callbackHandlers/fn_loadSettings.sqf +++ b/@RangerMetrics/addons/RangerMetrics/functions/callbackHandlers/fn_loadSettings.sqf @@ -6,7 +6,7 @@ if (_function isEqualTo "loadSettingsJSON") exitWith { RangerMetrics_recordingSettings = _data get "recordingSettings"; RangerMetrics_debug = RangerMetrics_settings get "arma3" get "debug"; - + [ format [ "Settings loaded: %1", @@ -16,8 +16,8 @@ if (_function isEqualTo "loadSettingsJSON") exitWith { ] call RangerMetrics_fnc_log; if (isServer) then { - ["RangerMetrics_serverProfileName", profileName] remoteExecCall ["setVariable", 0, true]; RangerMetrics_serverProfileName = profileName; + publicVariable "RangerMetrics_serverProfileName"; }; call RangerMetrics_fnc_initCapture; }; diff --git a/@RangerMetrics/addons/RangerMetrics/functions/capture/EHOnly/fn_milsim_serverEfficiency.sqf b/@RangerMetrics/addons/RangerMetrics/functions/capture/EHOnly/fn_milsim_serverEfficiency.sqf index 1e6c9be..f0c6c22 100644 --- a/@RangerMetrics/addons/RangerMetrics/functions/capture/EHOnly/fn_milsim_serverEfficiency.sqf +++ b/@RangerMetrics/addons/RangerMetrics/functions/capture/EHOnly/fn_milsim_serverEfficiency.sqf @@ -1,10 +1,10 @@ -params ["_fields", []]; +params [["_fields", []]]; // Example: -// [ -// ["float", "milsim_raw_cps", "3207.98"], -// ["float", "milsim_cps", "1"] -// ] +// ["milsim_serverEfficiency", [[ +// ["float", "milsim_raw_cps", "3207.98"], +// ["float", "milsim_cps", "1"] +// ]]] call CBA_fnc_serverEvent; private _settings = RangerMetrics_recordingSettings get "CBAEventHandlers" get "milsimServerEfficiency"; diff --git a/@RangerMetrics/addons/RangerMetrics/functions/capture/fn_player_performance.sqf b/@RangerMetrics/addons/RangerMetrics/functions/capture/fn_player_performance.sqf index c42649c..d4c6aa6 100644 --- a/@RangerMetrics/addons/RangerMetrics/functions/capture/fn_player_performance.sqf +++ b/@RangerMetrics/addons/RangerMetrics/functions/capture/fn_player_performance.sqf @@ -6,7 +6,9 @@ private _settings = RangerMetrics_recordingSettings get "playerPerformance"; _x params ["_playerID", "_ownerId", "_playerUID", "_profileName", "_displayName", "_steamName", "_clientState", "_isHC", "_adminState", "_networkInfo", "_unit"]; _networkInfo params ["_avgPing", "_avgBandwidth", "_desync"]; - if (_unit == objNull || _isHC) exitWith {}; + if (_unit == objNull || _isHC) then { + continue; + }; [ _settings get "bucket", diff --git a/@RangerMetrics/addons/RangerMetrics/functions/captureDefinitions/fn_server_missionEH.sqf b/@RangerMetrics/addons/RangerMetrics/functions/captureDefinitions/fn_server_missionEH.sqf index d60605a..e5b93ee 100644 --- a/@RangerMetrics/addons/RangerMetrics/functions/captureDefinitions/fn_server_missionEH.sqf +++ b/@RangerMetrics/addons/RangerMetrics/functions/captureDefinitions/fn_server_missionEH.sqf @@ -36,7 +36,7 @@ ["server_events", "PlayerConnected", [ ["string", "playerUID", _userInfo#2] ], [ - ["int", "id", _id], + ["string", "id", _id toFixed 0], ["string", "uid", _uid], ["string", "name", _name], ["bool", "jip", _jip], @@ -53,7 +53,7 @@ ["server_events", "PlayerDisconnected", [ ["string", "playerUID", _userInfo#2] ], [ - ["int", "id", _id], + ["string", "id", _id toFixed 0], ["string", "uid", _uid], ["string", "name", _name], ["bool", "jip", _jip],