Fixes and bug adding

scripting/l4d2_autorestart.sp

@@ -34,11 +34,25 @@ public void OnPluginStart() {
 	cvar_hibernateWhenEmpty = FindConVar("sv_hibernate_when_empty");
 
 	RegAdminCmd("sm_request_restart", Command_RequestRestart, ADMFLAG_GENERIC);
+	RegAdminCmd("sm_ar_status", Command_Status, ADMFLAG_GENERIC);
 
 	CreateTimer(600.0, Timer_Check, _, TIMER_REPEAT);
 }
 
-public Action Command_RequestRestart(int client, int args) {
+Action Command_Status(int client, int args) {
+	char buffer[100];
+	FormatTime(buffer, sizeof(buffer), "%F at %I:%M %p", startupTime);
+	ReplyToCommand(client, "Started: %s", buffer);
+	int diff = GetTime() - startupTime;
+	int exceedRestart = diff - MAX_TIME_ONLINE_SECONDS;
+	int exceedRestartMin = exceedRestart / 60;
+	int exceedRestartHour = exceedRestartMin / 60;
+	ReplyToCommand(client, "Overdue restart time: %d hr / %d min / %d s", exceedRestartHour, exceedRestartMin, exceedRestart);
+	ReplyToCommand(client, "triesBots = %d\ttriesEmpty = %d / %d", triesBots, triesEmpty);
+	return Plugin_Handled;
+}
+
+Action Command_RequestRestart(int client, int args) {
 	if(IsServerEmpty()) {
 		ReplyToCommand(client, "Restarting...");
 		LogAction(client, -1, "requested to restart server if empty.");
@@ -57,8 +71,8 @@ public Action Timer_Check(Handle h) {
 			ServerCommand("quit");
 		}
 		return Plugin_Continue;
-	} else if(GetTime() - startupTime > MAX_TIME_ONLINE_SECONDS) {
+	} else if(pendingRestart || GetTime() - startupTime > MAX_TIME_ONLINE_SECONDS) {
-		LogAction(0, -1, "Server has passed max online time threshold, will restart if remains empty");
+		LogAction(0, -1, "Server has passed max online time threshold, will restart if remains empty (chk%d)", triesEmpty);
 		pendingRestart = true;
 		cvar_hibernateWhenEmpty.BoolValue = false;
 		if(IsServerEmpty()) {

scripting/l4d2_crescendo_control.sp

@@ -62,7 +62,7 @@ public void OnPluginStart()
 
 	RegAdminCmd("sm_dgroup", Command_DebugGroups, ADMFLAG_GENERIC);
 	for(int i = 0; i < MAX_GROUPS; i++) {
-		g_groups[i].members = new ArrayList();
+		g_groups[i].members = null;
 	}
 }
 
@@ -193,6 +193,12 @@ bool ComputeGroups(GroupResult result, float activateFlow) {
 	bool inGroup[MAXPLAYERS+1];
 
 	ArrayList members = new ArrayList();
+	for(int i = 0; i < MAX_GROUPS; i++) { 
+		if(g_groups[i].members != null) { 
+			delete g_groups[i].members;
+		}
+	}
+	
 	for(int i = 1; i <= MaxClients; i++) {
 		if(!inGroup[i] && IsClientConnected(i) && IsClientInGame(i) && IsPlayerAlive(i) && GetClientTeam(i) == 2) {
 			float prevFlow = L4D2Direct_GetFlowDistance(i);
@@ -214,7 +220,7 @@ bool ComputeGroups(GroupResult result, float activateFlow) {
 							inGroup[i] = true;
 							// PrintDebug("add leader to group %d: %N", groupIndex + 1, i);
 						}
-						// PrintDebug("add member to group %d: %N (dist = %.4f) (fldiff = %.1f)", groupIndex + 1, j, dist, flowDiff);
+						PrintDebug("add member to group %d: %N (dist = %.4f) (fldiff = %.1f)", groupIndex + 1, j, dist, flowDiff);
 						inGroup[j] = true;
 						members.Push(GetClientUserId(j));
 					} else {
@@ -222,13 +228,14 @@ bool ComputeGroups(GroupResult result, float activateFlow) {
 					}
 				}
 			}
-			if(g_groups[groupIndex].members.Length > 1) {
+			if(members.Length > 1) {
 				// Drop the old members:
 				if(g_groups[groupIndex].members != null) {
 					delete g_groups[groupIndex].members;
 				}
 				g_groups[groupIndex].pos = prevPos;
 				g_groups[groupIndex].members = members;
+				members = new ArrayList();
 				// PrintDebug("created group #%d with %d members", groupIndex + 1, g_groups[groupIndex].members.Length);
 				groupIndex++;
 				if(groupIndex == MAX_GROUPS) {
@@ -258,7 +265,7 @@ bool ComputeGroups(GroupResult result, float activateFlow) {
 
 	PrintDebug("===GROUP SUMMARY===");
 	for(int i = 0; i < MAX_GROUPS; i++) {
-		if(g_groups[i].members.Length > 0) {
+		if(g_groups[i].members != null && g_groups[i].members.Length > 0) {
 			PrintDebug("---Group %d---", i + 1);
 			PrintDebug("Origin: %.1f %.1f %.1f", g_groups[i].pos[0], g_groups[i].pos[1], g_groups[i].pos[2]);
 			float groupFlow = GetFlowAtPosition(g_groups[i].pos);

scripting/l4d_survivor_identity_fix.sp

@@ -31,7 +31,8 @@ char g_Models[MAXPLAYERS+1][128];
 static int g_iPendingCookieModel[MAXPLAYERS+1];
 
 Handle hConf = null;
-static Handle hDHookSetModel = null, hModelPrefCookie;
+static Handle hDHookSetModel = null;
+Cookie modelPrefCookie;
 static ConVar hCookiesEnabled;
 static bool isLateLoad, cookieModelsSet, isL4D1Survivors;
 static int survivors;
@@ -84,7 +85,7 @@ public void OnPluginStart()
 	GetGamedata();
 	
 	CreateConVar("l4d_survivor_identity_fix_version", PLUGIN_VERSION, "Survivor Change Fix Version", FCVAR_SPONLY|FCVAR_NOTIFY|FCVAR_DONTRECORD);
-	hCookiesEnabled = CreateConVar("l4d_survivor_identity_fix_cookies", "1.0", "0 -> Disable cookie preference, 1 -> Enable for 5+, 2 -> Enable for any amount");
+	hCookiesEnabled = CreateConVar("l4d_survivor_identity_fix_cookies", "2.0", "0 -> Disable cookie preference, 1 -> Enable for 5+, 2 -> Enable for any amount");
 
 	HookEvent("player_bot_replace", Event_PlayerToBot, EventHookMode_Post);
 	HookEvent("bot_player_replace", Event_BotToPlayer, EventHookMode_Post);
@@ -111,7 +112,7 @@ public void OnPluginStart()
 		chooseMenu.AddItem(info, survivor_names[i]);
 	}
 
-	hModelPrefCookie = RegClientCookie("survivor_model", "Survivor model preference", CookieAccess_Public);
+	modelPrefCookie = RegClientCookie("survivor_model", "Survivor model preference", CookieAccess_Public);
 	RegConsoleCmd("sm_survivor", Cmd_SetSurvivor, "Sets your preferred survivor");
 }
 
@@ -260,20 +261,23 @@ public void Event_NewGame(Event event, const char[] name, bool dontBroadcast) {
 }
 //Checks if a user has a model preference cookie (set by native). If so, populate g_Models w/ it
 public void OnClientCookiesCached(int client) {
-	if(IsFakeClient(client) && hCookiesEnabled.IntValue == 0) return;
+	return;
+	if(IsFakeClient(client) || hCookiesEnabled.IntValue == 0) return;
 
 	char modelPref[2];
-	GetClientCookie(client, hModelPrefCookie, modelPref, sizeof(modelPref));
+	modelPrefCookie.Get(client, modelPref, sizeof(modelPref));
 	if(strlen(modelPref) > 0) {
 		//'type' starts at 1, 5 being other l4d1 survivors for l4d2
 		int type;
 		if(StringToIntEx(modelPref, type) > 0) {
 			PrintToServer("%N has cookie for %s", client, survivor_models[type - 1][17]);
 			if(isL4D1Survivors && type > 4) {
-				strcopy(g_Models[client], 64, survivor_models[type - 5]);
+				strcopy(g_Models[client], 32, survivor_models[type - 5]);
-				g_iPendingCookieModel[client] = type - 4;
+				g_iPendingCookieModel[client] = type - 5;
+			} else {
+				strcopy(g_Models[client], 32, survivor_models[type - 1]);
+				g_iPendingCookieModel[client] = type - 1;
 			}
-			
 		}
 	}
 }
@@ -316,6 +320,7 @@ public void Frame_CheckClient(int userid) {
 		if(survivors > survivorThreshold) {
 			//A model is set: Fetched from cookie
 			if(g_iPendingCookieModel[client]) {
+				return;
 				CreateTimer(0.2, Timer_SetClientModel, userid);
 			}/* else {
 				CreateTimer(0.2, Timer_SetAllCookieModels);
@@ -427,13 +432,13 @@ public Action Cmd_SetSurvivor(int client, int args) {
 		char arg1[16];
 		GetCmdArg(1, arg1, sizeof(arg1));
 		if(arg1[0] == 'c') {
-			SetClientCookie(client, hModelPrefCookie, "");
+			modelPrefCookie.Set(client, "");
 			ReplyToCommand(client, "Your survivor preference has been reset");
 			return Plugin_Handled;
 		}
 		int number;
 		if(StringToIntEx(arg1, number) > 0 && number >= 0 && number < 8) {
-			SetClientCookie(client, hModelPrefCookie, arg1);
+			modelPrefCookie.Set(client, arg1);
 			ReplyToCommand(client, "Your survivor preference set to %s", survivor_names[number]);
 			return Plugin_Handled;
 		}else{
@@ -454,13 +459,13 @@ int Menu_ChooseSurvivor(Menu menu, MenuAction action, int activator, int item) {
 		char info[2];
 		menu.GetItem(item, info, sizeof(info));
 		if(info[0] == 'c') {
-			SetClientCookie(activator, hModelPrefCookie, "");
+			modelPrefCookie.Set(activator, "");
 			ReplyToCommand(activator, "Your survivor preference has been reset");
 		}else{
 			/*strcopy(g_Models[client], 64, survivor_models[type]);
 			if(isL4D1Survivors) type = GetSurvivorId(str, true);
 			SetEntProp(client, Prop_Send, "m_survivorCharacter", type);*/
-			SetClientCookie(activator, hModelPrefCookie, info);
+			modelPrefCookie.Set(activator, info);
 			ReplyToCommand(activator, "Your survivor preference set to %s", survivor_names[StringToInt(info) - 1]);
 		}
 	} else if (action == MenuAction_End)	
@@ -507,7 +512,7 @@ public int Native_SetPlayerModel(Handle plugin, int numParams) {
 		char charTypeStr[2];
 		Format(charTypeStr, sizeof(charTypeStr), "%d", character + 1);
 		if(!IsFakeClient(client) && keep)
-			SetClientCookie(client, hModelPrefCookie, charTypeStr);
+			modelPrefCookie.Set(client, charTypeStr);
 
 		strcopy(g_Models[client], 64, survivor_models[character]);
 		return 0;