Remove unnecessary rules and watermark waitUntils

SQF/dayz_code/system/progress_monitor.sqf

@@ -1,4 +1,4 @@
-private["_display","_control1","_control2"];
+private["_display","_control1","_control2","_watermark"];
 disableSerialization;
 //diag_log "DEBUG: loadscreen guard started.";
 
@@ -11,6 +11,19 @@ while {true} do {
 	};
 	if ((!isNil "Dayz_loginCompleted") and {(Dayz_loginCompleted)}) exitWith { 
 		//diag_log [ __FILE__, __LINE__, "End loop"];
+		
+		// Logo watermark: adding a logo in the bottom left corner of the screen with the server name
+		if (!isNil "dayZ_serverName") then {
+			5 cutRsc ["wm_disp","PLAIN"];
+			_watermark = (uiNamespace getVariable "wm_disp") displayCtrl 1;
+			_watermark ctrlSetText dayZ_serverName;
+			if (profileNamespace getVariable ["streamerMode",0] == 1) then {_watermark ctrlShow false;};
+		};
+		
+		if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then {
+			dayz_rulesHandle = execVM "rules.sqf";
+		};
+		
 		if (dayz_groupSystem) then {execVM "\z\addons\dayz_code\groups\init.sqf";};
 	};
 	_display = uiNameSpace getVariable "BIS_loadingScreen";

SQF/dayz_code/system/watermark.sqf

@@ -1,11 +0,0 @@
-// Logo watermark: adding a logo in the bottom left corner of the screen with the server name in it
-[] spawn {
-	waitUntil {(!isNull Player) and (alive Player) and (player == player)};
-	waituntil {!(isNull (findDisplay 46))};
-	5 cutRsc ["wm_disp","PLAIN"];
-	((uiNamespace getVariable "wm_disp") displayCtrl 1) ctrlSetText dayZ_serverName;
-	
-	if (profileNamespace getVariable ["streamerMode",0] == 1) then {
-		(uiNamespace getVariable "wm_disp") displayCtrl 1 ctrlShow false;
-	};
-};

Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_1.Takistan/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_11.Chernarus/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_12.isladuala/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_13.Tavi/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_15.namalsk/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_16.Panthera2/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_17.Chernarus/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_2.Utes/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_20.fapovo/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_21.Caribou/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_22.smd_sahrani_A2/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_23.cmr_ovaron/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_24.Napf/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_24.Napf/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_25.sauerland/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_25.sauerland/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/init.sqf

@@ -131,8 +131,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_26.sauerland_winter/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_4.Zargabad/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_7.Lingor/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],

Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf

@@ -130,8 +130,6 @@ if (!isDedicated) then {
 		([4654,9595,0] nearestObject 145260) setDamage 1;
 	};
 	
-	if (dayz_enableRules && (profileNamespace getVariable ["streamerMode",0] == 0)) then { dayz_rulesHandle = execVM "rules.sqf"; };
-	if (!isNil "dayZ_serverName") then { execVM "\z\addons\dayz_code\system\watermark.sqf"; };
 	if (dayz_townGenerator) then { execVM "\z\addons\dayz_code\compile\client_plantSpawner.sqf"; };
 	execFSM "\z\addons\dayz_code\system\player_monitor.fsm";
 	//[false,12] execVM "\z\addons\dayz_code\compile\local_lights_init.sqf";

Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/rules.sqf

@@ -1,7 +1,5 @@
 private ["_messages","_timeout"];
 
-waitUntil {uiSleep 1; !isNil ("Dayz_loginCompleted")};
-
 _messages = [
 	["DayZ Epoch", "Welcome "+(name player)],
 	["World", worldName],