Apollo - Add runtime player data (group, team, vehicle, medical)

addons/apollo/XEH_PREP.hpp

@@ -8,6 +8,7 @@ PREP(invokeJavaMethod);
 PREP(lockerAction);
 PREP(playerLoadClient);
 PREP(playerSaveClient);
+PREP(playerSingletonLoad);
 PREP(playerSingletonSave);
 PREP(vehicleLoad);
 PREP(vehicleSaveServer);

addons/apollo/XEH_postInitServer.sqf

@@ -35,7 +35,13 @@ if (GVAR(enabledPlayers)) then {
     // Save player
     [QGVAR(savePlayer), {
         params ["_player", "_name", "_type"];
-        [_player, getPlayerUID _player, _name, _type] call FUNC(playerSingletonSave);
+        private _uid = getPlayerUID _player;
+
+        if (_type == "validate") then {
+            [_player, _uid, _name] call FUNC(playerSingletonLoad);
+        };
+
+        [_player, _uid, _name, _type] call FUNC(playerSingletonSave);
     }] call CBA_fnc_addEventHandler;
 
     // Player died
@@ -46,7 +52,7 @@ if (GVAR(enabledPlayers)) then {
         [QGVAR(reinitializePlayer), [_player, _registeredDeath], _player] call CBA_fnc_targetEvent;
     }] call CBA_fnc_addEventHandler;
 
-    // Corpse removal (prevent item multiplication when leaving nicely)
+    // Corpse removal (prevent item multiplication when leaving nicely) and additional runtime data handler
     addMissionEventHandler ["HandleDisconnect", FUNC(handleDisconnect)];
 
     // Start client initialization

addons/apollo/XEH_preInit.sqf

@@ -15,4 +15,8 @@ if (isServer) then {
 
 GVAR(isDebug) = false;
 
+if (isServer) then {
+    GVAR(playerRuntimeData) = createHashMap;
+};
+
 ADDON = true;

addons/apollo/functions/fnc_handleDisconnect.sqf

@@ -2,6 +2,7 @@
 /*
  * Author: Jonpas
  * Handles save and corpse removal on disconnect.
+ * Runs only on server.
  *
  * Arguments:
  * 0: Unit <OBJECT>

addons/apollo/functions/fnc_playerLoadClient.sqf

@@ -56,6 +56,7 @@ if (!isNil "_result") then {
     // Validate
     // Delay to allow Arma server to get the new loadout before attempting to validate
     // Validation does nothing at this moment as it was never properly implemented in the backend
+    // This is also used to load runtime (current mission run) data
     [{
         [QGVAR(savePlayer), [_this, profileName, "validate"]] call CBA_fnc_serverEvent;
     }, _player, 1] call CBA_fnc_waitAndExecute;

addons/apollo/functions/fnc_playerSingletonLoad.sqf

@@ -0,0 +1,49 @@
+#include "script_component.hpp"
+/*
+ * Author: Jonpas
+ * Loads runtime (current mission run) player data on the server.
+ *
+ * Arguments:
+ * 0: Player <OBJECT>
+ * 1: Player UID <STRING>
+ * 2: Player Name <STRING>
+ *
+ * Return Value:
+ * None
+ *
+ * Example:
+ * [player, "36182159512951925", "Banana"] call tac_apollo_fnc_playerSingletonLoad
+ *
+ * Public: No
+ */
+
+params ["_player", "_uid", "_name"];
+
+private _playerRuntimeData = GVAR(playerRuntimeData) get _uid;
+if (isNil "_playerRuntimeData") exitWith {}; // didn't actually disconnect
+INFO_2("Player '%1' (%2) reconnected",_name,_uid);
+
+_playerRuntimeData params ["_oldGroup", "_oldTeam", "_oldVehicle", "_oldMedical"];
+
+// Group
+if ((group _player) isNotEqualTo _oldGroup && {!isNull _oldGroup}) then {
+    [_player] join _oldGroup;
+};
+
+// Team
+if (assignedTeam _player != _oldTeam && {_oldTeam != ""}) then {
+    _player assignTeam _oldTeam;
+};
+
+// Vehicle
+if (!isNull _oldVehicle) then {
+    if !(_player moveInAny _oldVehicle) then {
+        WARNING_2("Failed to move player '%1' back into vehicle!",_player,_oldVehicle);
+    };
+};
+
+// Medical
+[_player, _oldMedical] call ACEFUNC(medical,deserializeState);
+
+// Clear for correct disconect check
+GVAR(playerRuntimeData) deleteAt _uid;

addons/apollo/functions/fnc_playerSingletonSave.sqf

@@ -43,6 +43,15 @@ private _selectedWeapon = currentWeapon _player;
 // Variables TODO
 private _playerVariables = [];
 
+// Save additional data relevant only for the current mission run
+GVAR(playerRuntimeData) set [_uid, [
+    group _player,
+    assignedTeam _player,
+    vehicle _player,
+    [_player] call ACEFUNC(medical,serializeState)
+]];
+
+// Send to backend
 private _serverReply = ["storeInfantry", _type, _uid, _name, _playerPos, _playerDir, _loadout, _selectedWeapon, _playerVariables] call FUNC(invokeJavaMethod);
 
 TRACE_2("Singleton Save",_type,_serverReply);