diff --git a/SpecialSettingsSunday/scripting/SpecialSettingsSunday.sp b/SpecialSettingsSunday/scripting/SpecialSettingsSunday.sp index 4b799bf1..350b7e92 100644 --- a/SpecialSettingsSunday/scripting/SpecialSettingsSunday.sp +++ b/SpecialSettingsSunday/scripting/SpecialSettingsSunday.sp @@ -19,7 +19,6 @@ public Plugin myinfo = Handle g_VoteMenu = INVALID_HANDLE; Handle g_SettingsList = INVALID_HANDLE; -Handle g_CountdownTimer = INVALID_HANDLE; ConVar g_cvHlxBonus; ConVar g_cvBhop; @@ -75,7 +74,7 @@ public void OnAllPluginsLoaded() if (!g_bTeamManagerLoaded || (g_bTeamManagerLoaded && !TeamManager_InWarmup())) { if (CheckConditions()) - g_CountdownTimer = CreateTimer(1.0, StartVote, INVALID_HANDLE, TIMER_REPEAT|TIMER_FLAG_NO_MAPCHANGE); + CreateTimer(1.0, StartVote, INVALID_HANDLE, TIMER_REPEAT|TIMER_FLAG_NO_MAPCHANGE); } } @@ -97,7 +96,7 @@ public void TeamManager_WarmupEnd() return; if (CheckConditions()) - g_CountdownTimer = CreateTimer(1.0, StartVote, INVALID_HANDLE, TIMER_REPEAT|TIMER_FLAG_NO_MAPCHANGE); + CreateTimer(1.0, StartVote, INVALID_HANDLE, TIMER_REPEAT|TIMER_FLAG_NO_MAPCHANGE); } public void OnClientPutInServer(int client) @@ -198,7 +197,7 @@ public void ConVarChanged(ConVar convar, char[] oldValue, const char[] newValue) public Action Command_ForceVote(int client, int args) { GenerateArray(); - g_CountdownTimer = CreateTimer(1.0, StartVote, INVALID_HANDLE, TIMER_REPEAT|TIMER_FLAG_NO_MAPCHANGE); + CreateTimer(1.0, StartVote, INVALID_HANDLE, TIMER_REPEAT|TIMER_FLAG_NO_MAPCHANGE); CreateTimer(0.1, DisableFunMode, INVALID_HANDLE, TIMER_FLAG_NO_MAPCHANGE); return Plugin_Handled; } @@ -275,9 +274,11 @@ public Action StartVote(Handle timer) if (iCountDown-- <= 0) { iCountDown = 5; - CloseHandle(g_CountdownTimer); InitiateVote(); + return Plugin_Stop; } + + return Plugin_Continue; } public void InitiateVote() @@ -285,7 +286,7 @@ public void InitiateVote() if(IsVoteInProgress()) { CPrintToChatAll("{green}[Special Settings Sunday] {white}Another vote is currently in progress, retrying again in 5s."); - g_CountdownTimer = CreateTimer(1.0, StartVote, INVALID_HANDLE, TIMER_REPEAT|TIMER_FLAG_NO_MAPCHANGE); + CreateTimer(1.0, StartVote, INVALID_HANDLE, TIMER_REPEAT|TIMER_FLAG_NO_MAPCHANGE); return; } @@ -344,7 +345,7 @@ public void Handler_SettingsVoteFinished(Handle menu, int num_votes, int num_cli PushArrayString(g_SettingsList, sFirst); PushArrayString(g_SettingsList, sSecond); g_bIsRevote = true; - g_CountdownTimer = CreateTimer(1.0, StartVote, INVALID_HANDLE, TIMER_REPEAT|TIMER_FLAG_NO_MAPCHANGE); + CreateTimer(1.0, StartVote, INVALID_HANDLE, TIMER_REPEAT|TIMER_FLAG_NO_MAPCHANGE); return; }