Merge pull request #4561 from Citadel-Station-13/upstream-merge-33853

[MIRROR] If the world is launched with the "no-init" param. Master.Initialize isn't called
2017-12-28 23:49:28 -06:00
parent 90582d2e1a 19df2df07b
commit bfd0c7edfa
1 changed files with 3 additions and 0 deletions
@@ -37,6 +37,9 @@ GLOBAL_PROTECT(security_mode)
 	if(fexists(RESTART_COUNTER_PATH))
 		GLOB.restart_counter = text2num(trim(file2text(RESTART_COUNTER_PATH)))
 		fdel(RESTART_COUNTER_PATH)
+	
+	if("no-init" in params)
+		return

 	Master.Initialize(10, FALSE)