diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index 7f1fdbc95..a5fda7151 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -244,7 +244,7 @@ link128[] = {108,109}; link129[] = {109,110}; link130[] = {110,64}; globals[] = {0.000000,0,0,0,0,640,480,3,262,6316128,1,-273.728088,309.860291,1963.873291,1148.161011,890,1244,1}; -window[] = {2,-1,-1,-1,-1,812,286,1306,286,3,908}; +window[] = {2,-1,-1,-1,-1,760,234,1254,234,3,908}; *//*%FSM*/ class FSM { @@ -708,7 +708,7 @@ class FSM " dayz_myBackpackWpns = [];" \n "};" \n "PVCDZ_plr_Login2 = [];" \n - "PVDZ_plr_Login2 = [_charID,player,_playerUID,_spawnSelection];" \n + "PVDZ_plr_Login2 = [_charID,player,_playerUID,_spawnSelection,_inventory];" \n "publicVariableServer ""PVDZ_plr_Login2"";" \n "diag_log ['Sent to server: PVDZ_plr_Login2', PVDZ_plr_Login2]; " \n "dayz_loadScreenMsg = localize 'str_player_requesting_character';" \n @@ -1215,8 +1215,7 @@ class FSM init = /*%FSM*/"diag_log 'player_forceSave called from fsm';" \n "//call player_forceSave;" \n "" \n - "publicVariableServer ""PVDZ_plr_LoginRecord"";" \n - "call player_forceSave;"/*%FSM*/; + "publicVariableServer ""PVDZ_plr_LoginRecord"";"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { diff --git a/SQF/dayz_server/compile/server_playerSetup.sqf b/SQF/dayz_server/compile/server_playerSetup.sqf index 712688098..bd36408c5 100644 --- a/SQF/dayz_server/compile/server_playerSetup.sqf +++ b/SQF/dayz_server/compile/server_playerSetup.sqf @@ -3,6 +3,7 @@ private ["_characterID","_playerObj","_playerID","_dummy","_worldspace","_state" _characterID = _this select 0; _playerObj = _this select 1; _spawnSelection = _this select 3; +_inventory = _this select 4; _playerID = getPlayerUID _playerObj; #include "\z\addons\dayz_server\compile\server_toggle_debug.hpp" @@ -231,6 +232,10 @@ _clientID publicVariableClient "PVCDZ_plr_plantSpawner"; //record time started _playerObj setVariable ["lastTime",time]; +//set server-side inventory variable to monitor player gear +_playerObj setVariable["ServerMagArray",[_inventory select 1, _inventory select 2], false]; + + //diag_log format["LOGIN PUBLISHING: UID#%1 CID#%2 %3 as %4 should spawn at %5",getPlayerUID _playerObj,_characterID,_playerObj call fa_plr2str,typeOf _playerObj,(_worldspace select 1) call fa_coor2str]; PVDZ_plr_Login1 = null;