diff --git a/SQF/dayz_code/compile/player_switchModel.sqf b/SQF/dayz_code/compile/player_switchModel.sqf index 28a7a0211..2e8fc12a4 100644 --- a/SQF/dayz_code/compile/player_switchModel.sqf +++ b/SQF/dayz_code/compile/player_switchModel.sqf @@ -108,7 +108,12 @@ _switchUnit = { _rndx = floor(random 100); _rndy = floor(random 100); _oldUnit setPosATL [(_createSafePos select 0) + _rndx, (_createSafePos select 1) + _rndy, 0]; - _newUnit setPosATL _position; + 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;}; diff --git a/SQF/dayz_code/system/mission/debug_floor.sqf b/SQF/dayz_code/system/mission/debug_floor.sqf deleted file mode 100644 index bfae1a10e..000000000 --- a/SQF/dayz_code/system/mission/debug_floor.sqf +++ /dev/null @@ -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 -}; \ No newline at end of file diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf index 6c66003d5..cb632163f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf index e228b7c1c..820be30b3 100644 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf index 38a2adf89..48bf5600a 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf index 12412a6da..c9f3e56ae 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf index 0f25a2457..f55c4a5ef 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf index b163cd308..77afd4f38 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf index fb955dad3..29d09f76a 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf index 32f5b3703..6f21ff383 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf index f4b23c797..6c79256c8 100644 --- a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf index 6a7e8b0bd..9c38f52df 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf index 121d0bf8f..696ce5fff 100644 --- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf index c979089dc..2be5c354f 100644 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf index d0f93122b..7ed531f30 100644 --- a/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf index f85311bdd..160f4d766 100644 --- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf index caee03847..d9db50da0 100644 --- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf index 8cb2db1a6..ddc3b4411 100644 --- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf index c0d9df072..28d645dfa 100644 --- a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf index f4c342bce..f04b1bfaa 100644 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf index c345891ee..ab4a8c7bc 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf index cb6dd6104..e46a9d519 100644 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf index 375effb70..57525e32b 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf index 313752bba..48664c067 100644 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf @@ -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; diff --git a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf index 9de7ffd80..143fcec99 100644 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf @@ -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;