Merge pull request #3048 from Citadel-Station-13/upstream-merge-31157

[MIRROR] Fixes events with sleeps.
2017-10-01 16:32:00 -04:00
parent f538d91fe8 004700de62
commit c8647565fc
1 changed files with 9 additions and 0 deletions
@@ -157,19 +157,28 @@
 		return

 	if(activeFor == startWhen)
+		processing = FALSE
 		start()
+		processing = TRUE

 	if(activeFor == announceWhen)
+		processing = FALSE
 		announce()
+		processing = TRUE

 	if(startWhen < activeFor && activeFor < endWhen)
+		processing = FALSE
 		tick()
+		processing = TRUE

 	if(activeFor == endWhen)
+		processing = FALSE
 		end()
+		processing = TRUE

 	// Everything is done, let's clean up.
 	if(activeFor >= endWhen && activeFor >= announceWhen && activeFor >= startWhen)
+		processing = FALSE
 		kill()

 	activeFor++