W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-26 17:51:51 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix wrong vehicle update if the player disconnects

Browse Source
This commit is contained in:
AirwavesMan
2020-11-15 15:43:02 +01:00
parent c78d6859b8
commit ae52a0e5e8
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
SQF/dayz_server/compile/server_playerSync.sqf
View File

@@ -18,12 +18,12 @@ _humanity = 0;
_name = if (alive _character) then {name _character} else {"Dead Player"}; _name = if (alive _character) then {name _character} else {"Dead Player"};
_inDebug = (respawn_west_original distance _charPos) < 1500; _inDebug = (respawn_west_original distance _charPos) < 1500;
_exitReason = switch true do { _exitReason = call {
case (isNil "_characterID"): {("ERROR: Cannot Sync Character " + _name + " has nil characterID")}; //Unit is null if (isNil "_characterID") exitwith {("ERROR: Cannot Sync Character " + _name + " has nil characterID")}; //Unit is null
case (_inDebug): {format["INFO: Cannot Sync Character %1 near respawn_west %2. This is normal when relogging or changing clothes.",_name,_charPos]}; if (_inDebug) exitwith {format["INFO: Cannot Sync Character %1 near respawn_west %2. This is normal when relogging or changing clothes.",_name,_charPos]};
case (_characterID == "0"): {("ERROR: Cannot Sync Character " + _name + " has no characterID")}; if (_characterID == "0") exitwith {("ERROR: Cannot Sync Character " + _name + " has no characterID")};
case (_character isKindOf "Animal"): {("ERROR: Cannot Sync Character " + _name + " is an Animal class")}; if (_character isKindOf "Animal") exitwith {("ERROR: Cannot Sync Character " + _name + " is an Animal class")};
default {"none"}; "none";
}; };
if (_exitReason != "none") exitWith { if (_exitReason != "none") exitWith {
@@ -123,11 +123,11 @@ if (_lastTime == -1) then {
/* /*
Get character state details Get character state details
*/ */
_currentWpn = currentMuzzle _character; _currentWpn = currentMuzzle _character;
_currentAnim = animationState _character; _currentAnim = animationState _character;
_config = configFile >> "CfgMovesMaleSdr" >> "States" >> _currentAnim; _config = configFile >> "CfgMovesMaleSdr" >> "States" >> _currentAnim;
_onLadder = (getNumber (_config >> "onLadder")) == 1; _onLadder = (getNumber (_config >> "onLadder")) == 1;
_isTerminal = (getNumber (_config >> "terminal")) == 1; _isTerminal = (getNumber (_config >> "terminal")) == 1;
//_wpnDisabled = (getNumber (_config >> "disableWeapons")) == 1; //_wpnDisabled = (getNumber (_config >> "disableWeapons")) == 1;
_currentModel = typeOf _character; _currentModel = typeOf _character;
if (_currentModel == _modelChk) then { if (_currentModel == _modelChk) then {
@@ -136,6 +136,12 @@ if (_currentModel == _modelChk) then {
_currentModel = str _currentModel; _currentModel = str _currentModel;
_character setVariable ["model_CHK",typeOf _character]; _character setVariable ["model_CHK",typeOf _character];
}; };
// If player is in a vehicle, keep its position updated
if (vehicle _character != _character) then {
[vehicle _character, "position"] call server_updateObject;
};
if (count _this > 4) then { //calling from player_onDisconnect if (count _this > 4) then { //calling from player_onDisconnect
if (_this select 4) then { //combat logged if (_this select 4) then { //combat logged
_medical set [1, true]; //set unconcious to true _medical set [1, true]; //set unconcious to true
@@ -144,18 +150,18 @@ if (count _this > 4) then { //calling from player_onDisconnect
//_character setVariable ["unconsciousTime",150,true]; // Set knock out timer to 2 minutes 30 seconds //_character setVariable ["unconsciousTime",150,true]; // Set knock out timer to 2 minutes 30 seconds
//_character setVariable ["USEC_injured",true]; // Set status to bleeding //_character setVariable ["USEC_injured",true]; // Set status to bleeding
//_character setVariable ["USEC_BloodQty",3000]; // Set blood to 3000 //_character setVariable ["USEC_BloodQty",3000]; // Set blood to 3000
}; };
if (_isInVehicle) then { if (_isInVehicle) then {
//if the player object is inside a vehicle lets eject the player //if the player object is inside a vehicle lets eject the player
_relocate = ((vehicle _character isKindOf "Air") && (_charPos select 2 > 1.5)); _relocate = ((vehicle _character isKindOf "Air") && (_charPos select 2 > 1.5));
_character action ["eject", vehicle _character]; _character action ["eject", vehicle _character];
// Prevent relog in parachute, heli or plane above base exploit to get inside // Prevent relog in parachute, heli or plane above base exploit to get inside
if (_relocate) then { if (_relocate) then {
_count = 0; _count = 0;
_maxDist = 800; _maxDist = 800;
_newPos = [_charPos, 80, _maxDist, 10, 1, 0, 0, [], [_charPos,_charPos]] call BIS_fnc_findSafePos; _newPos = [_charPos, 80, _maxDist, 10, 1, 0, 0, [], [_charPos,_charPos]] call BIS_fnc_findSafePos;
while {_newPos distance _charPos == 0} do { while {_newPos distance _charPos == 0} do {
_count = _count + 1; _count = _count + 1;
if (_count > 4) exitWith {_newPos = _charPos;}; // Max 4km away fail safe (needs to finish fast so server_playerSync runs below) if (_count > 4) exitWith {_newPos = _charPos;}; // Max 4km away fail safe (needs to finish fast so server_playerSync runs below)
@@ -172,7 +178,7 @@ if (_onLadder or _isInVehicle or _isTerminal) then {
//If position to be updated, make sure it is at ground level! //If position to be updated, make sure it is at ground level!
if ((count _playerPos > 0) && !_isTerminal) then { if ((count _playerPos > 0) && !_isTerminal) then {
_charPos set [2,0]; _charPos set [2,0];
_playerPos set [1,_charPos]; _playerPos set [1,_charPos];
}; };
}; };
if (_isInVehicle) then { if (_isInVehicle) then {
@@ -180,7 +186,7 @@ if (_isInVehicle) then {
} else { } else {
if (typeName _currentWpn == "STRING") then { if (typeName _currentWpn == "STRING") then {
_muzzles = getArray (configFile >> "cfgWeapons" >> _currentWpn >> "muzzles"); _muzzles = getArray (configFile >> "cfgWeapons" >> _currentWpn >> "muzzles");
if (count _muzzles > 1) then {_currentWpn = currentMuzzle _character;}; if (count _muzzles > 1) then {_currentWpn = currentMuzzle _character;};
} else { } else {
//diag_log ("DW_DEBUG: _currentWpn: " + str(_currentWpn)); //diag_log ("DW_DEBUG: _currentWpn: " + str(_currentWpn));
_currentWpn = ""; _currentWpn = "";
@@ -188,11 +194,6 @@ if (_isInVehicle) then {
}; };
_currentState = [[_currentWpn,_currentAnim,_temp],[]]; _currentState = [[_currentWpn,_currentAnim,_temp],[]];
// If player is in a vehicle, keep its position updated
if (vehicle _character != _character) then {
[vehicle _character, "position"] call server_updateObject;
};
//Reset timer //Reset timer
if (_timeSince > 0) then { if (_timeSince > 0) then {
_character setVariable ["lastTime",(diag_ticktime - _timeLeft)]; _character setVariable ["lastTime",(diag_ticktime - _timeLeft)];