From f43348ebf67402b88a56e7d43cb23c95a16afec9 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Fri, 11 Nov 2016 15:19:57 -0500 Subject: [PATCH] Consolidate isServer checks for poi Vanilla commit: https://github.com/DayZMod/DayZ/commit/fbcabc6d602088a7843da793378703ff4e7524dc --- .../system/mission/chernarus/poi/init.sqf | 20 +++++++++---------- .../MPMissions/DayZ_Epoch_1.Takistan/init.sqf | 5 ++--- .../DayZ_Epoch_10.Mountains_ACR/init.sqf | 5 ++--- .../DayZ_Epoch_11.Chernarus/init.sqf | 5 ++--- .../DayZ_Epoch_12.isladuala/init.sqf | 5 ++--- .../MPMissions/DayZ_Epoch_13.Tavi/init.sqf | 5 ++--- .../MPMissions/DayZ_Epoch_15.namalsk/init.sqf | 5 ++--- .../DayZ_Epoch_16.Panthera2/init.sqf | 5 ++--- .../DayZ_Epoch_17.Chernarus/init.sqf | 5 ++--- .../DayZ_Epoch_19.FDF_Isle1_a/init.sqf | 5 ++--- .../MPMissions/DayZ_Epoch_2.Utes/init.sqf | 5 ++--- .../MPMissions/DayZ_Epoch_20.fapovo/init.sqf | 5 ++--- .../MPMissions/DayZ_Epoch_21.Caribou/init.sqf | 5 ++--- .../DayZ_Epoch_22.smd_sahrani_A2/init.sqf | 5 ++--- .../DayZ_Epoch_23.cmr_ovaron/init.sqf | 5 ++--- .../MPMissions/DayZ_Epoch_24.Napf/init.sqf | 5 ++--- .../DayZ_Epoch_25.sauerland/init.sqf | 5 ++--- .../DayZ_Epoch_26.sauerland_winter/init.sqf | 5 ++--- .../DayZ_Epoch_3.Shapur_BAF/init.sqf | 5 ++--- .../MPMissions/DayZ_Epoch_4.Zargabad/init.sqf | 5 ++--- .../DayZ_Epoch_5.Bootcamp_ACR/init.sqf | 5 ++--- .../MPMissions/DayZ_Epoch_7.Lingor/init.sqf | 5 ++--- .../DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf | 5 ++--- .../DayZ_Epoch_9.Woodland_ACR/init.sqf | 5 ++--- 24 files changed, 55 insertions(+), 80 deletions(-) diff --git a/SQF/dayz_code/system/mission/chernarus/poi/init.sqf b/SQF/dayz_code/system/mission/chernarus/poi/init.sqf index 78b5f9651..55a0cc825 100644 --- a/SQF/dayz_code/system/mission/chernarus/poi/init.sqf +++ b/SQF/dayz_code/system/mission/chernarus/poi/init.sqf @@ -1,12 +1,10 @@ -if (isServer) then { - [] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\DevilsFarm.sqf"; - [] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\NEA.sqf"; - [] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\C130Crash.sqf"; - [] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\ChernoBuildings.sqf"; - [] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\DeadForest.sqf"; - [] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\KomyshovoRoadblock.sqf"; - [] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\MilitaryAirpoort.sqf"; - [] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\ZelenogorskBuildings.sqf"; - [] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\Twains.sqf"; -}; +[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\DevilsFarm.sqf"; +[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\NEA.sqf"; +[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\C130Crash.sqf"; +[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\ChernoBuildings.sqf"; +[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\DeadForest.sqf"; +[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\KomyshovoRoadblock.sqf"; +[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\MilitaryAirpoort.sqf"; +[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\ZelenogorskBuildings.sqf"; +[] execVM "\z\addons\dayz_code\system\mission\chernarus\poi\Twains.sqf"; diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf index 0aeef0389..42fc0de12 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\takistan.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; 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 db41af028..422dd44e8 100644 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\mountains_acr.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf index 4d66e2beb..2b433d627 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\chernarus11.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf index 670ee82e1..c44c6eabd 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\isladuala.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf index 4887fe274..e4ffaadba 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\tavi.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf index d885d46d3..f20d939ff 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\namalsk.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf index 90f025357..c0aa65dab 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\panthera2.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf index 7223717da..660ec7b06 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\chernarus17.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; 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 e6091b73f..1c848b77e 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 @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\fdf_isle1_a.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf index 9da4ca5c4..19d955063 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\utes.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf index 33cecf6c7..627b86e36 100644 --- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\fapovo.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf index 9e853a4d1..87f9c5932 100644 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\caribou.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; 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 f0f6acd42..7af8d1b2e 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 @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\smd_sahrani_a2.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; 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 081c86fd0..388506f83 100644 --- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\cmr_ovaron.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf index c54edc708..42d9a3692 100644 --- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\napf.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf index a320f13be..d94d86b7c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\sauerland.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; 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 c8f702396..a4f6948f5 100644 --- a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf @@ -114,14 +114,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\sauerland.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; 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 e3d4e88f4..710697de9 100644 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\shapur_baf.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf index 56ce25ed6..4ae4725e2 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\zargabad.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; 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 335c81c90..3e7e147ad 100644 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\bootcamp_acr.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf index 32adfad18..e8fe40373 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\lingor.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; 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 57f168d53..70dd7705e 100644 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\provinggrounds_pmc.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; }; 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 91693fc01..87b8b7105 100644 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf @@ -113,14 +113,13 @@ if (isServer) then { call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf"; call compile preprocessFileLineNumbers "\z\addons\dayz_server\traders\woodland_acr.sqf"; //Add trader agents call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf"; + //Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) + if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; }; //Get the server to setup what waterholes are going to be infected and then broadcast to everyone. if (dayz_infectiousWaterholes && (toLower worldName == "chernarus")) then {execVM "\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\init.sqf";}; -//Must be global spawned, so players don't fall through buildings (might be best to spilt these to important, not important) -if (dayz_POIs && (toLower worldName == "chernarus")) then { execVM "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf"; }; - // Lootable objects from CfgTownGeneratorDefault.hpp if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\system\mission\chernarus\LegacyTownGenerator\MainLootableObjects.sqf"; };