Arma3_Epoch/Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/Epoch.git synced 2024-08-30 18:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed issue that could cause spawning at old position

Browse Source 
if jammer owner checks failed
This commit is contained in:
vbawol 2017-03-04 13:00:31 -06:00
parent f5d51c4127
commit 308f1eb875
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Sources/epoch_server/compile/epoch_player/EPOCH_server_loadPlayer.sqf
View File

@ -114,22 +114,23 @@ if (!isNull _player) then {
_dir = random 360; _dir = random 360;
// try to find respawn point by position // try to find respawn point by position
_newLocation = _server_vars param [0,[]]; // 0 = RESPAWN POS _newLocation = _server_vars param [0,[]]; // 0 = RESPAWN POS
// normal respawn location
_location = getMarkerPos "respawn_west";
_location set[2, 0];
if (_newLocation isEqualType [] && {(count _newLocation) == 3}) then { if (_newLocation isEqualType [] && {(count _newLocation) == 3}) then {
_jammers = nearestObjects[_newLocation, ["PlotPole_EPOCH"], 1]; _jammers = nearestObjects[_newLocation, ["PlotPole_EPOCH"], 1];
if !(_jammers isEqualTo[]) then { if !(_jammers isEqualTo[]) then {
// get nearby jammer // get nearby object
_jammer = _jammers param [0,objNull]; _jammer = _jammers param [0,objNull];
// check if jammer is not null and is alive. // check if object is not null and is alive.
if (!isNull _jammer && {alive _jammer}) then { if (!isNull _jammer && {alive _jammer}) then {
// check if player is still a member of jammers group. // check if player is still a member of object group.
if ((_jammer getVariable["BUILD_OWNER", "-1"]) in [_playerUID, _playerGroup]) then { if ((_jammer getVariable["BUILD_OWNER", "-1"]) in [_playerUID, _playerGroup]) then {
// Override location with that of object
_location = _newLocation; _location = _newLocation;
}; };
}; };
}; };
} else {
_location = getMarkerPos "respawn_west";
_location set[2, 0];
}; };
if (_alreadyDead) then { if (_alreadyDead) then {
_vars = call EPOCH_defaultVars_SEPXVar; _vars = call EPOCH_defaultVars_SEPXVar;