W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-13 19:52:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set unit posATL in switchModel if respawn is in water

Browse Source 
Reverts:

bcc16a0135

See:

e8e5d24e80
This commit is contained in:
ebaydayz
2016-09-17 15:41:49 -04:00
parent 5f0c2fcc49
commit 29d9ed9211
25 changed files with 6 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
SQF/dayz_code/compile/player_switchModel.sqf
View File

@@ -108,7 +108,12 @@ _switchUnit = {
_rndx = floor(random 100);
_rndy = floor(random 100);
_oldUnit setPosATL [(_createSafePos select 0) + _rndx, (_createSafePos select 1) + _rndy, 0];
if (surfaceIsWater _createSafePos) then {
//Prevent swimming in ground glitch if respawn is in water
_newUnit setPosATL [_position select 0,_position select 1,(_position select 2)+.1];
} else {
_newUnit setPosATL _position;
};
removeAllWeapons _oldUnit;
{_oldUnit removeMagazine _x;} count magazines _oldUnit;
if !(isNull _oldUnit) then {deleteVehicle _oldUnit;};

17
SQF/dayz_code/system/mission/debug_floor.sqf
View File

@@ -1,17 +0,0 @@
/*
Fixes swimming in ground after spawn, change clothes or relog
on maps with respawn_west position in water.
*/
private ["_debug","_floor"];
_debug = getMarkerPos "respawn_west";
if (surfaceIsWater _debug) then {
_debug set [2,0.1];
_floor = "MetalFloor_DZ" createVehicleLocal [0,0,0];
_floor setPosASL _debug;
_floor allowDamage false;
_floor enableSimulation false;
_floor setVariable ["",true,false]; // stops global setVariable by sched_townGenerator, checked in player_spawnCheck for loot spawn
};

1
Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\takistan.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\mountains_acr.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus11.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\isladuala.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\tavi.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\namalsk.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\panthera2.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus17.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\fdf_isle1_a.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\utes.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\fapovo.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\caribou.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\smd_sahrani_a2.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\cmr_ovaron.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\napf.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\sauerland.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "custom\compiles.sqf"; //Compile custom compiles
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\sauerland.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\shapur_baf.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\zargabad.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\bootcamp_acr.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\lingor.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\provinggrounds_pmc.sqf"; //Add trader city objects locally on each machine early
initialized = true;

1
Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf
View File

@@ -102,7 +102,6 @@ progressLoadingScreen 0.2;
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\BIS_Effects\init.sqf";
progressLoadingScreen 0.25;
call compile preprocessFileLineNumbers "server_traders.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\debug_floor.sqf";
call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\woodland_acr.sqf"; //Add trader city objects locally on each machine early
initialized = true;