diff --git a/SQF/dayz_code/actions/doorManagement/doorAddFriend.sqf b/SQF/dayz_code/actions/doorManagement/doorAddFriend.sqf index 9a7ce66c7..4f78c52f8 100644 --- a/SQF/dayz_code/actions/doorManagement/doorAddFriend.sqf +++ b/SQF/dayz_code/actions/doorManagement/doorAddFriend.sqf @@ -20,11 +20,7 @@ _friends set [(count _friends), _toAdd]; TheDoor setVariable ["doorfriends", _friends, true]; PVDZ_veh_Save = [TheDoor,"gear"]; -if (isServer) then { - PVDZ_veh_Save call server_updateObject; -} else { - publicVariableServer "PVDZ_veh_Save"; -}; +publicVariableServer "PVDZ_veh_Save"; call DoorGetFriends; call DoorNearbyHumans; diff --git a/SQF/dayz_code/actions/doorManagement/doorRemoveFriend.sqf b/SQF/dayz_code/actions/doorManagement/doorRemoveFriend.sqf index 46e183c4b..ae3b0fb9b 100644 --- a/SQF/dayz_code/actions/doorManagement/doorRemoveFriend.sqf +++ b/SQF/dayz_code/actions/doorManagement/doorRemoveFriend.sqf @@ -11,12 +11,9 @@ _newList = []; }; } forEach _friends; TheDoor setVariable ["doorfriends", _newList, true]; + PVDZ_veh_Save = [TheDoor, "gear"]; -if (isServer) then { - PVDZ_veh_Save call server_updateObject; -} else { - publicVariableServer "PVDZ_veh_Save"; -}; +publicVariableServer "PVDZ_veh_Save"; call DoorGetFriends; -call DoorNearbyHumans; \ No newline at end of file +call DoorNearbyHumans; diff --git a/SQF/dayz_code/actions/plotManagement/plotAddFriend.sqf b/SQF/dayz_code/actions/plotManagement/plotAddFriend.sqf index 310604b7c..b00ec5939 100644 --- a/SQF/dayz_code/actions/plotManagement/plotAddFriend.sqf +++ b/SQF/dayz_code/actions/plotManagement/plotAddFriend.sqf @@ -23,11 +23,7 @@ _friends set [(count _friends), _toAdd]; _thePlot setVariable ["plotfriends", _friends, true]; PVDZ_veh_Save = [_thePlot,"gear"]; -if (isServer) then { - PVDZ_veh_Save call server_updateObject; -} else { - publicVariableServer "PVDZ_veh_Save"; -}; +publicVariableServer "PVDZ_veh_Save"; call PlotGetFriends; call PlotNearbyHumans; diff --git a/SQF/dayz_code/actions/plotManagement/plotRemoveFriend.sqf b/SQF/dayz_code/actions/plotManagement/plotRemoveFriend.sqf index 2061471fe..602082c00 100644 --- a/SQF/dayz_code/actions/plotManagement/plotRemoveFriend.sqf +++ b/SQF/dayz_code/actions/plotManagement/plotRemoveFriend.sqf @@ -13,12 +13,9 @@ _newList = []; }; } count _friends; _thePlot setVariable ["plotfriends", _newList, true]; + PVDZ_veh_Save = [_thePlot,"gear"]; -if (isServer) then { - PVDZ_veh_Save call server_updateObject; -} else { - publicVariableServer "PVDZ_veh_Save"; -}; +publicVariableServer "PVDZ_veh_Save"; call PlotGetFriends; -call PlotNearbyHumans; \ No newline at end of file +call PlotNearbyHumans; diff --git a/SQF/dayz_code/compile/player_onPause.sqf b/SQF/dayz_code/compile/player_onPause.sqf index 47aeb5282..a392e08d0 100644 --- a/SQF/dayz_code/compile/player_onPause.sqf +++ b/SQF/dayz_code/compile/player_onPause.sqf @@ -44,6 +44,7 @@ while {(!isNull _display) && !r_player_dead} do { case (_inCombat && !_zedCheck && !_playerCheck) : { _btnAbort ctrlEnable false; _btnAbort ctrlSetText format["%1 (in %2)", _btnAbortText, ceil (_timeout - diag_tickTime)]; + [localize "str_abort_playerincombat",1] call dayz_rollingMessages; }; case (isInTraderCity) : { _btnAbort ctrlEnable false; @@ -68,4 +69,4 @@ while {(!isNull _display) && !r_player_dead} do { }; TimeOutDisplayed = false; -if (r_player_dead) exitWith {_btnAbort ctrlEnable true;}; \ No newline at end of file +if (r_player_dead) exitWith {_btnAbort ctrlEnable true;}; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 7abfae9df..994675b0f 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -7526,7 +7526,7 @@ durch stumpfe Gewalteinwirkung. - Cannot Abort near another player!<br/>You are still in Combat. + You cannot abort near another player! Нельзя выходить находясь рядом с другим игроком!<br/>Вы все еще в бою! ¡No puedes abortar cerca de otros jugadores!<br/>Todavía estás en combate. Nemůžete ukončit hru, když jste poblíž jiného hráče.<br/>Stále jste v boji. @@ -7534,7 +7534,7 @@ Du kannst dich nicht in der Nähe eines anderen Spielers ausloggen, du befindest dich noch immer in Gefahr! - Cannot Abort Zombies are near!<br/>You are still in Combat. + You cannot abort near Zombies! Нельзя выходить находясь рядом с зомби!<br/>Вы все еще в бою! ¡No puedes abortar cerca de zombies!<br/>Todavía estás en combate. Nemůžete ukončit hru, když jsou zombie poblíž.<br/>Stále jste v boji. @@ -7542,7 +7542,7 @@ Du kannst dich nicht in der Nähe von Zombies ausloggen, du befindest dich noch immer in Gefahr! - Cannot Abort while in combat! + You cannot abort while in combat! Du kannst dich nicht im Kampf ausloggen! Нельзя выходить в бою! ¡No puedes abortar en combate! @@ -16314,7 +16314,7 @@ Einladen - Invite From + Invite from Einladung von @@ -16322,8 +16322,8 @@ Du hast %1 eingeladen der Gruppe beizutreten. - You were kicked from the group - Du wurdest aus der Gruppe entfernt + You were kicked from the group. + Du wurdest aus der Gruppe entfernt. %1 was kicked from the group. @@ -16358,7 +16358,7 @@ Du brauchst ein Funkgerät um einer Gruppe beizutreten. - Lost radio contact with group + Lost radio contact with group. Funkkontakt zur Gruppe verloren. diff --git a/SQF/dayz_server/compile/server_deleteObj.sqf b/SQF/dayz_server/compile/server_deleteObj.sqf index a512c4dbb..67c91b6b8 100644 --- a/SQF/dayz_server/compile/server_deleteObj.sqf +++ b/SQF/dayz_server/compile/server_deleteObj.sqf @@ -1,7 +1,7 @@ /* [_objectID,_objectUID] call server_deleteObj; */ -private["_id","_uid","_key"]; +private["_id","_uid","_key","_activatingPlayer"]; _id = _this select 0; _uid = _this select 1; _activatingPlayer = _this select 2; diff --git a/SQF/dayz_server/compile/server_maintainArea.sqf b/SQF/dayz_server/compile/server_maintainArea.sqf index 67dffc815..6d95dcf01 100644 --- a/SQF/dayz_server/compile/server_maintainArea.sqf +++ b/SQF/dayz_server/compile/server_maintainArea.sqf @@ -4,7 +4,8 @@ 2: PVDZE_maintainArea = [player,2,[Object, _objectID, _objectUID]]; */ -private ["_player","_name","_ObjArray","_uniqueID","_key"]; +private ["_player","_option","_obj","_name","_objectsInfo","_UID","_ID","_key"]; + _player = _this select 0; _option = _this select 1; _objectsInfo = _this select 2; diff --git a/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf b/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf index 80461c574..d4d2940d3 100644 --- a/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf +++ b/SQF/dayz_server/compile/server_onPlayerDisconnect.sqf @@ -6,7 +6,7 @@ References to the player object after that point will return objNull, so this function and server_playerSync must be fast or the player will not save. */ -private ["_playerObj","_playerUID","_playerPos","_playerName"]; +private ["_playerObj","_playerUID","_playerPos","_playerName","_characterID","_inCombat","_Sepsis","_myGroup"]; _playerUID = _this select 0; _playerName = _this select 1; diff --git a/SQF/dayz_server/compile/server_playerDied.sqf b/SQF/dayz_server/compile/server_playerDied.sqf index 86d754ed7..5709ccbb6 100644 --- a/SQF/dayz_server/compile/server_playerDied.sqf +++ b/SQF/dayz_server/compile/server_playerDied.sqf @@ -1,6 +1,6 @@ #include "\z\addons\dayz_server\compile\server_toggle_debug.hpp" -private ["_characterID","_minutes","_newObject","_playerID","_key","_pos","_infected","_sourceName","_sourceWeapon","_distance","_message","_method","_suicide"]; +private ["_characterID","_minutes","_newObject","_playerID","_playerName","_key","_pos","_infected","_sourceName","_sourceWeapon","_distance","_message","_method","_suicide"]; //[unit, weapon, muzzle, mode, ammo, magazine, projectile] _characterID = _this select 0; diff --git a/SQF/dayz_server/compile/server_playerLogin.sqf b/SQF/dayz_server/compile/server_playerLogin.sqf index 59789983c..5649cf782 100644 --- a/SQF/dayz_server/compile/server_playerLogin.sqf +++ b/SQF/dayz_server/compile/server_playerLogin.sqf @@ -1,4 +1,4 @@ -private ["_playerID","_forEachIndex","_endMission","_0","_1","_timeleft","_doLoop","_key","_primary","_model","_inventory","_backpack","_survival","_CharacterCoins","_group","_playerCoins","_BankCoins","_hiveVer","_mags","_wpns","_bcpk","_config","_isInfected","_remaining","_playerObj","_playerName","_newPlayer","_isNew","_charID","_isHiveOk"]; +private ["_playerID","_endMission","_0","_1","_timeleft","_doLoop","_key","_primary","_model","_inventory","_backpack","_survival","_CharacterCoins","_group","_playerCoins","_BankCoins","_hiveVer","_mags","_wpns","_bcpk","_config","_isInfected","_remaining","_playerObj","_playerName","_newPlayer","_isNew","_charID","_isHiveOk"]; #include "\z\addons\dayz_server\compile\server_toggle_debug.hpp" diff --git a/SQF/dayz_server/compile/server_playerSetup.sqf b/SQF/dayz_server/compile/server_playerSetup.sqf index ab35de2b0..0d2bb35e7 100644 --- a/SQF/dayz_server/compile/server_playerSetup.sqf +++ b/SQF/dayz_server/compile/server_playerSetup.sqf @@ -1,4 +1,4 @@ -private ["_characterID","_playerObj","_playerID","_dummy","_worldspace","_state","_doLoop","_key","_primary","_medical","_stats","_humanity","_randomSpot","_position","_debug","_distance","_fractures","_score","_findSpot","_mkr","_j","_isIsland","_w","_clientID","_lastInstance"]; +private ["_characterID","_playerObj","_spawnSelection","_inventory","_playerID","_dummy","_worldspace","_state","_doLoop","_key","_primary","_medical","_stats","_humanity","_randomSpot","_position","_debug","_distance","_fractures","_score","_findSpot","_mkr","_j","_isIsland","_w","_clientID","_lastInstance"]; _characterID = _this select 0; _playerObj = _this select 1; diff --git a/SQF/dayz_server/compile/server_publishFullObject.sqf b/SQF/dayz_server/compile/server_publishFullObject.sqf index d6d558cc7..60a2af1ec 100644 --- a/SQF/dayz_server/compile/server_publishFullObject.sqf +++ b/SQF/dayz_server/compile/server_publishFullObject.sqf @@ -1,4 +1,4 @@ -private ["_class","_uid","_charID","_object","_worldspace","_key","_allowed"]; +private ["_class","_inventory","_hitpoints","_damage","_fuel","_uid","_charID","_object","_worldspace","_key","_allowed"]; _charID = _this select 0; _object = _this select 1; diff --git a/SQF/dayz_server/compile/server_publishObject.sqf b/SQF/dayz_server/compile/server_publishObject.sqf index f7a1bbdb2..80e899a18 100644 --- a/SQF/dayz_server/compile/server_publishObject.sqf +++ b/SQF/dayz_server/compile/server_publishObject.sqf @@ -1,6 +1,6 @@ #include "\z\addons\dayz_server\compile\server_toggle_debug.hpp" -private ["_type ","_objectUID ","_characterID ","_object","_worldspace","_key", "_ownerArray", "_inventory"]; +private ["_type","_objectUID","_characterID","_object","_worldspace","_key","_ownerArray","_inventory"]; _characterID = _this select 0; _object = _this select 1; diff --git a/Server Files/@DayZ_Epoch_Server/addons/dayz_server.pbo b/Server Files/@DayZ_Epoch_Server/addons/dayz_server.pbo deleted file mode 100644 index 3c946930b..000000000 Binary files a/Server Files/@DayZ_Epoch_Server/addons/dayz_server.pbo and /dev/null differ