Merge branch 'lonsfor-patch-1'

leaderboard.lua

@@ -83,11 +83,24 @@ local cv_gui = CV_RegisterVar({
 	PossibleValue = {Off = GUI_OFF, Splits = GUI_SPLITS, On = GUI_ON}
 })
 
-local cv_afk = CV_RegisterVar({
+local AntiAFK = true
+CV_RegisterVar({
 	name = "lb_afk",
 	defaultvalue = 1,
-	flags = CV_NETVAR,
-	PossibleValue = CV_OnOff
+	flags = CV_NETVAR | CV_CALL,
+	PossibleValue = CV_OnOff,
+	func = function(v)
+		-- Set players afkTime and toggle AntiAFK
+		if v.value then
+			for p in players.iterate do
+				p.afkTime = leveltime
+			end
+
+			AntiAFK = true
+		else
+			AntiAFK = false
+		end
+	end
 })
 
 local cv_enable = CV_RegisterVar({
@@ -1146,7 +1159,7 @@ local function think()
 	end
 
 	if disable then
-		if cv_afk.value then
+		if AntiAFK then
 			if ingame() > 1 then
 				for p in players.iterate do
 					if p.valid and not p.spectator and not p.exiting and p.lives > 0 then
@@ -1272,6 +1285,7 @@ local function think()
 			p.afkTime = leveltime
 		end
 
+		if not replayplayback then
 			if leveltime > PREVENT_JOIN_TIME and p.afkTime + AFK_TIMEOUT > leveltime then
 				if cv_teamchange.value then
 					allowJoin(false)
@@ -1281,6 +1295,7 @@ local function think()
 					allowJoin(true)
 				end
 			end
+		end
 
 		if p.laps >= mapheaderinfo[gamemap].numlaps and timeFinished == 0 then
 			timeFinished = p.realtime