From e81f19757e67db9d02ea70506c56f82a397735ed Mon Sep 17 00:00:00 2001
From: ebayShopper <ebayShopper@users.noreply.github.com>
Date: Mon, 20 Mar 2017 14:11:18 -0400
Subject: [PATCH] Move POI back to global spawn again

These contain trees and buildings which need their chopped/destroyed
status synchronized for all clients.

This reverts c21a731.

Vanilla commit:

https://github.com/DayZMod/DayZ/commit/32f2fa3b22f78948f1c00aaf32d687058c69d6da
---
 CHANGE LOG 1.0.6.2.txt                                       | 1 +
 SQF/dayz_code/system/mission/chernarus/poi/C130Crash.sqf     | 2 +-
 .../system/mission/chernarus/poi/ChernoBuildings.sqf         | 2 +-
 SQF/dayz_code/system/mission/chernarus/poi/DeadForest.sqf    | 2 +-
 SQF/dayz_code/system/mission/chernarus/poi/DevilsFarm.sqf    | 2 +-
 .../system/mission/chernarus/poi/KomyshovoRoadblock.sqf      | 2 +-
 .../system/mission/chernarus/poi/MilitaryAirpoort.sqf        | 2 +-
 SQF/dayz_code/system/mission/chernarus/poi/NEA.sqf           | 2 +-
 SQF/dayz_code/system/mission/chernarus/poi/NWATentCamp.sqf   | 2 +-
 .../system/mission/chernarus/poi/ZelenogorskBuildings.sqf    | 2 +-
 SQF/dayz_code/system/mission/chernarus/poi/init.sqf          | 5 +++--
 Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf       | 2 +-
 Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf | 2 +-
 Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf     | 2 +-
 Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf     | 2 +-
 Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf          | 2 +-
 Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf       | 2 +-
 Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf     | 2 +-
 Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf     | 2 +-
 Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf   | 2 +-
 Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf           | 2 +-
 Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf        | 2 +-
 Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf       | 2 +-
 .../MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf         | 2 +-
 Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf    | 2 +-
 Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf          | 2 +-
 Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf     | 2 +-
 .../MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf       | 2 +-
 Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf     | 2 +-
 Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf       | 2 +-
 Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf   | 2 +-
 Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf         | 2 +-
 .../MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf      | 2 +-
 Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf   | 2 +-
 34 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/CHANGE LOG 1.0.6.2.txt b/CHANGE LOG 1.0.6.2.txt
index c5f59defb..51d479be4 100644
--- a/CHANGE LOG 1.0.6.2.txt	
+++ b/CHANGE LOG 1.0.6.2.txt	
@@ -1,6 +1,7 @@
 [NEW] Added a few loot positions for Namalsk and Takistan. @skigoggles
 
 [FIXED] Kamaz refuel trucks no longer allow automatic refueling. #1855 @coresync2k @dreamforceinc
+[FIXED] POIs were moved back to global spawn again. This synchronizes the POI buildings and trees destroyed/chopped status for all clients.
 
 [NOTE] Fixes below are included in the mission file and server pbo as part of server package 1.0.6.1A (March 10th 2017)
 [FIXED] Fixed food and drink going down 10x faster from melee and other "working" actions. 
diff --git a/SQF/dayz_code/system/mission/chernarus/poi/C130Crash.sqf b/SQF/dayz_code/system/mission/chernarus/poi/C130Crash.sqf
index c0d4012b1..13fa3d349 100644
--- a/SQF/dayz_code/system/mission/chernarus/poi/C130Crash.sqf
+++ b/SQF/dayz_code/system/mission/chernarus/poi/C130Crash.sqf
@@ -27,4 +27,4 @@
 	["Land_Camp_Fire_DZ",[12707.344,9520.4121,-0.00011634827],0],
 	["Land_Camp_Fire_DZ",[12712.194,9544.3564,8.9676323],0],
 	["Land_Camp_Fire_DZ",[12710.407,9548.6572,8.768301],0]
-],false,false,true] call fnc_spawnObjects;
\ No newline at end of file
+],false,false,false] call fnc_spawnObjects;
\ No newline at end of file
diff --git a/SQF/dayz_code/system/mission/chernarus/poi/ChernoBuildings.sqf b/SQF/dayz_code/system/mission/chernarus/poi/ChernoBuildings.sqf
index cde37f760..d32b7f715 100644
--- a/SQF/dayz_code/system/mission/chernarus/poi/ChernoBuildings.sqf
+++ b/SQF/dayz_code/system/mission/chernarus/poi/ChernoBuildings.sqf
@@ -36,4 +36,4 @@
 	["Body2",[6966.3115,2770.1753,4.7683716e-005],50.185974],
 	["Body1",[6956.0034,2779.5024,8.5830688e-005],0],
 	["Body2",[6965.25,2759.8867,9.727478e-005],-108.38199]
-],false,false,true] call fnc_spawnObjects;
\ No newline at end of file
+],false,false,false] call fnc_spawnObjects;
\ No newline at end of file
diff --git a/SQF/dayz_code/system/mission/chernarus/poi/DeadForest.sqf b/SQF/dayz_code/system/mission/chernarus/poi/DeadForest.sqf
index 846b8b854..8d30ac770 100644
--- a/SQF/dayz_code/system/mission/chernarus/poi/DeadForest.sqf
+++ b/SQF/dayz_code/system/mission/chernarus/poi/DeadForest.sqf
@@ -361,4 +361,4 @@
 	["Body2",[8295.9268,3044.8689,1.9073486e-006],-132.61189],
 	["BRDMWreck",[8295.1846,3038.5232,2.3365021e-005],-69.078674],
 	["Land_Ind_Workshop01_01",[8398.0586,3012.748,1.2397766e-005],98.278824]
-],false,false,true] call fnc_spawnObjects;
\ No newline at end of file
+],false,false,false] call fnc_spawnObjects;
\ No newline at end of file
diff --git a/SQF/dayz_code/system/mission/chernarus/poi/DevilsFarm.sqf b/SQF/dayz_code/system/mission/chernarus/poi/DevilsFarm.sqf
index 096026081..42ec770b6 100644
--- a/SQF/dayz_code/system/mission/chernarus/poi/DevilsFarm.sqf
+++ b/SQF/dayz_code/system/mission/chernarus/poi/DevilsFarm.sqf
@@ -402,4 +402,4 @@
 	["MAP_t_picea3f",[1720.7556,11643.052,0.00010681152],0],
 	["Mi8Wreck",[1726.4069,11681.369,-3.0517578e-005],-120.01289],
 	["Axe_woodblock",[1760.7675,11721.288,-0.48907313],-139.52458]
-],false,false,true] call fnc_spawnObjects;
\ No newline at end of file
+],false,false,false] call fnc_spawnObjects;
\ No newline at end of file
diff --git a/SQF/dayz_code/system/mission/chernarus/poi/KomyshovoRoadblock.sqf b/SQF/dayz_code/system/mission/chernarus/poi/KomyshovoRoadblock.sqf
index d5dd144c6..27b18643b 100644
--- a/SQF/dayz_code/system/mission/chernarus/poi/KomyshovoRoadblock.sqf
+++ b/SQF/dayz_code/system/mission/chernarus/poi/KomyshovoRoadblock.sqf
@@ -40,4 +40,4 @@
 	["CampEast_EP1",[11744.933,3420.0603,-3.7193298e-005],-194.99712],
 	["Land_tent_east",[11730.796,3438.7427,2.7179718e-005],347.01086],
 	["Land_fort_bagfence_corner",[11715.259,3417.4905,6.1988831e-006],75.434654]
-],false,false,true] call fnc_spawnObjects;
\ No newline at end of file
+],false,false,false] call fnc_spawnObjects;
\ No newline at end of file
diff --git a/SQF/dayz_code/system/mission/chernarus/poi/MilitaryAirpoort.sqf b/SQF/dayz_code/system/mission/chernarus/poi/MilitaryAirpoort.sqf
index b31a50712..922d45021 100644
--- a/SQF/dayz_code/system/mission/chernarus/poi/MilitaryAirpoort.sqf
+++ b/SQF/dayz_code/system/mission/chernarus/poi/MilitaryAirpoort.sqf
@@ -207,4 +207,4 @@
 	["Body2",[3760.5063,10178.691],89.311447],
 	["Land_Misc_deerstand",[3773.8142,10158.719,3.0517578e-005],-13.109641],
 	["MAP_asf3_6konec",[3826.2429,10102.542,-3.0517578e-005],-9.4858913]
-],false,false,true] call fnc_spawnObjects;
\ No newline at end of file
+],false,false,false] call fnc_spawnObjects;
\ No newline at end of file
diff --git a/SQF/dayz_code/system/mission/chernarus/poi/NEA.sqf b/SQF/dayz_code/system/mission/chernarus/poi/NEA.sqf
index 24057c070..83c945e6d 100644
--- a/SQF/dayz_code/system/mission/chernarus/poi/NEA.sqf
+++ b/SQF/dayz_code/system/mission/chernarus/poi/NEA.sqf
@@ -389,4 +389,4 @@
 	["MAP_t_betula2w",[11906.236,12677.297,-3.0517578e-005],0],
 	["Land_Mil_Barracks_i",[12572.636,12497.678,6.1035156e-005],-3.3692484],
 	["Land_Ind_Workshop01_01",[11836.992,12685.103,7.6293945e-005],-71.381462]
-],false,false,true] call fnc_spawnObjects;
\ No newline at end of file
+],false,false,false] call fnc_spawnObjects;
\ No newline at end of file
diff --git a/SQF/dayz_code/system/mission/chernarus/poi/NWATentCamp.sqf b/SQF/dayz_code/system/mission/chernarus/poi/NWATentCamp.sqf
index abaef921c..6adfb79c1 100644
--- a/SQF/dayz_code/system/mission/chernarus/poi/NWATentCamp.sqf
+++ b/SQF/dayz_code/system/mission/chernarus/poi/NWATentCamp.sqf
@@ -192,4 +192,4 @@
 	["MAP_b_prunus",[3940.4402,11031.171,3.0517578e-005],1.3066831],
 	["Land_Misc_deerstand",[3887.9919,11048.234,0.44055828],133.44647],
 	["Land_Misc_deerstand",[3919.6902,11062.58,-6.1035156e-005],133.44647]
-],false,false,true] call fnc_spawnObjects;
\ No newline at end of file
+],false,false,false] call fnc_spawnObjects;
\ No newline at end of file
diff --git a/SQF/dayz_code/system/mission/chernarus/poi/ZelenogorskBuildings.sqf b/SQF/dayz_code/system/mission/chernarus/poi/ZelenogorskBuildings.sqf
index 2063210a0..8210ccb05 100644
--- a/SQF/dayz_code/system/mission/chernarus/poi/ZelenogorskBuildings.sqf
+++ b/SQF/dayz_code/system/mission/chernarus/poi/ZelenogorskBuildings.sqf
@@ -12,4 +12,4 @@
 	["MAP_phone_box",[2538.0273,5070.0796,3.0517578e-005],0],
 	["MAP_phone_box",[2540.3445,5070.0625,-1.5258789e-005],0],
 	["MAP_A_statue01",[2540.7234,5062.2808],0]
-],false,false,true] call fnc_spawnObjects;
\ No newline at end of file
+],false,false,false] call fnc_spawnObjects;
\ No newline at end of file
diff --git a/SQF/dayz_code/system/mission/chernarus/poi/init.sqf b/SQF/dayz_code/system/mission/chernarus/poi/init.sqf
index dbbb3cb4a..337047142 100644
--- a/SQF/dayz_code/system/mission/chernarus/poi/init.sqf
+++ b/SQF/dayz_code/system/mission/chernarus/poi/init.sqf
@@ -1,6 +1,7 @@
 /*
-	Add POI objects locally on every machine early.
-	Do not use execVM. This must be unscheduled to finish before player_monitor.fsm and server_monitor.sqf run. (objects or player spawn on top)
+	Add POI objects on server machine only.
+	Do not use execVM. This must be unscheduled to finish before server_monitor.sqf runs (vehicles or players can spawn on top)
+	Do not use createVehicleLocal for these. They contain trees and buildings (need chopped/destroyed status synchronized for all clients)
 */
 
 {
diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf
index fd232188f..8cbcbf075 100644
--- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\takistan.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\takistan.sqf"; //Add trader agents
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 36fa8032a..fe55917cf 100644
--- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\mountains_acr.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\mountains_acr.sqf"; //Add trader agents
diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf
index 221ae84ea..f8398585b 100644
--- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf	
@@ -107,7 +107,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus11.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -115,6 +114,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\chernarus11.sqf"; //Add trader agents
diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf
index 08c7af770..37810a9db 100644
--- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\isladuala.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\isladuala.sqf"; //Add trader agents
diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf
index 3edb96dfa..ac1c7fc56 100644
--- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\tavi.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\tavi.sqf"; //Add trader agents
diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf
index b0f105bb9..4ca8bdda5 100644
--- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\namalsk.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\namalsk.sqf"; //Add trader agents
diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf
index 9d58fe94c..2bff7dadb 100644
--- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\panthera2.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\panthera2.sqf"; //Add trader agents
diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf
index 1938d8316..ac543139c 100644
--- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus17.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\chernarus17.sqf"; //Add trader agents
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 a4f1ebf89..4dad482fb 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	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\fdf_isle1_a.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\fdf_isle1_a.sqf"; //Add trader agents
diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf
index 2b8d04f49..51092e04f 100644
--- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\utes.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\utes.sqf"; //Add trader agents
diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf
index 933343c62..56d8d451e 100644
--- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\fapovo.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\fapovo.sqf"; //Add trader agents
diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf
index 8214bac32..5930ac8b6 100644
--- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\caribou.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\caribou.sqf"; //Add trader agents
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 81b34cf41..97788411c 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	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\smd_sahrani_a2.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\smd_sahrani_a2.sqf"; //Add trader agents
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 a103f0eb6..debf59418 100644
--- a/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\cmr_ovaron.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\cmr_ovaron.sqf"; //Add trader agents
diff --git a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf
index 88d678ba5..a41f0e537 100644
--- a/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\napf.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\napf.sqf"; //Add trader agents
diff --git a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf
index f5c2cc328..08cbcb71a 100644
--- a/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\sauerland.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\sauerland.sqf"; //Add trader agents
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 cacafb364..2698e8ff4 100644
--- a/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf	
@@ -109,7 +109,6 @@ progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.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 every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -117,6 +116,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\sauerland.sqf"; //Add trader agents
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 108035f68..e07f58610 100644
--- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\shapur_baf.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\shapur_baf.sqf"; //Add trader agents
diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf
index b04792bb9..b9e8d7d10 100644
--- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\zargabad.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\zargabad.sqf"; //Add trader agents
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 44525acf4..f2ec636ca 100644
--- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\bootcamp_acr.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\bootcamp_acr.sqf"; //Add trader agents
diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf
index d4bbcd0dd..c0f8140c8 100644
--- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\lingor.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\lingor.sqf"; //Add trader agents
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 7d0e67fc3..eab11b69e 100644
--- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\provinggrounds_pmc.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\provinggrounds_pmc.sqf"; //Add trader agents
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 b1855eaca..26c41a2f6 100644
--- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf	
+++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf	
@@ -108,7 +108,6 @@ if (_verCheck) then {
 progressLoadingScreen 0.25;
 call compile preprocessFileLineNumbers "server_traders.sqf";
 call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\woodland_acr.sqf"; //Add trader city objects locally on every machine early
-if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";}; //Add POI objects locally on every machine early
 initialized = true;
 
 setTerrainGrid 25;
@@ -116,6 +115,7 @@ if (dayz_REsec == 1) then {call compile preprocessFileLineNumbers "\z\addons\day
 execVM "\z\addons\dayz_code\system\DynamicWeatherEffects.sqf";
 
 if (isServer) then {
+	if (dayz_POIs && (toLower worldName == "chernarus")) then {call compile preprocessFileLineNumbers "\z\addons\dayz_code\system\mission\chernarus\poi\init.sqf";};
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\dynamic_vehicle.sqf";
 	call compile preprocessFileLineNumbers "\z\addons\dayz_server\system\server_monitor.sqf";
 	execVM "\z\addons\dayz_server\traders\woodland_acr.sqf"; //Add trader agents