UNLOZE/sm-plugins
11
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reverted two return statements as i suspect them being cruelpits to glitched mapvotes

Browse Source
This commit is contained in:
jenz 2023-09-05 21:46:00 +02:00
parent 950fb9ce90
commit 5e026ff7f3
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mapchooser_extended/scripting/mapchooser_extended.sp
View File

@ -667,7 +667,8 @@ public Action Command_SetNextmap(int client, int args)
public Action Command_ReloadMaps(int client, int args) public Action Command_ReloadMaps(int client, int args)
{ {
InitializeOfficialMapList(); InitializeOfficialMapList();
return Plugin_Handled; //return Plugin_Handled;
//2023 5th september: temporary attempt to fix glitched mapvote
} }
public Action Command_hours_average(int client, int args) public Action Command_hours_average(int client, int args)
@ -732,7 +733,7 @@ public Action Timer_StartWarningTimer(Handle timer)
if(!g_WarningInProgress || g_WarningTimer == INVALID_HANDLE) if(!g_WarningInProgress || g_WarningTimer == INVALID_HANDLE)
SetupWarningTimer(WarningType_Vote); SetupWarningTimer(WarningType_Vote);
return Plugin_Handled; //return Plugin_Stop; //2023 5th september: temporary attempt to fix glitched mapvote
} }
public Action Timer_StartMapVote(Handle timer, Handle data) public Action Timer_StartMapVote(Handle timer, Handle data)
@ -949,7 +950,6 @@ public void CheckWinLimit(int winner_score)
if(!g_WarningInProgress || g_WarningTimer == INVALID_HANDLE) if(!g_WarningInProgress || g_WarningTimer == INVALID_HANDLE)
{ {
SetupWarningTimer(WarningType_Vote, MapChange_MapEnd); SetupWarningTimer(WarningType_Vote, MapChange_MapEnd);
//InitiateVote(MapChange_MapEnd, INVALID_HANDLE);
} }
} }
} }
@ -973,7 +973,6 @@ public void CheckMaxRounds(int roundcount)
if(!g_WarningInProgress || g_WarningTimer == INVALID_HANDLE) if(!g_WarningInProgress || g_WarningTimer == INVALID_HANDLE)
{ {
SetupWarningTimer(WarningType_Vote, MapChange_MapEnd); SetupWarningTimer(WarningType_Vote, MapChange_MapEnd);
//InitiateVote(MapChange_MapEnd, INVALID_HANDLE);
} }
} }
} }
@ -1000,7 +999,6 @@ public Action Event_PlayerDeath(Handle event, const char[] name, bool dontBroadc
if(!g_WarningInProgress || g_WarningTimer == INVALID_HANDLE) if(!g_WarningInProgress || g_WarningTimer == INVALID_HANDLE)
{ {
SetupWarningTimer(WarningType_Vote, MapChange_MapEnd); SetupWarningTimer(WarningType_Vote, MapChange_MapEnd);
//InitiateVote(MapChange_MapEnd, INVALID_HANDLE);
} }
} }
return Plugin_Continue; return Plugin_Continue;
@ -1012,7 +1010,6 @@ public Action Command_Mapvote(int client, int args)
SetupWarningTimer(WarningType_Vote, MapChange_MapEnd, INVALID_HANDLE, true); SetupWarningTimer(WarningType_Vote, MapChange_MapEnd, INVALID_HANDLE, true);
//InitiateVote(MapChange_MapEnd, INVALID_HANDLE);
return Plugin_Handled; return Plugin_Handled;
} }
@ -1138,9 +1135,6 @@ void InitiateVote(MapChange when, Handle inputlist=INVALID_HANDLE)
// Check if a vote is in progress first // Check if a vote is in progress first
if(IsVoteInProgress()) if(IsVoteInProgress())
{ {
// Cant start a vote, try again in 5 seconds.
//g_RetryTimer = CreateTimer(5.0, Timer_StartMapVote, _, TIMER_FLAG_NO_MAPCHANGE);
CPrintToChatAll("[MCE] %t", "Cannot Start Vote", FAILURE_TIMER_LENGTH); CPrintToChatAll("[MCE] %t", "Cannot Start Vote", FAILURE_TIMER_LENGTH);
Handle data; Handle data;
g_RetryTimer = CreateDataTimer(1.0, Timer_StartMapVote, data, TIMER_FLAG_NO_MAPCHANGE | TIMER_REPEAT); g_RetryTimer = CreateDataTimer(1.0, Timer_StartMapVote, data, TIMER_FLAG_NO_MAPCHANGE | TIMER_REPEAT);
@ -2016,7 +2010,6 @@ public int Native_InitiateVote(Handle plugin, int numParams)
LogAction(-1, -1, "Starting map vote because outside request"); LogAction(-1, -1, "Starting map vote because outside request");
SetupWarningTimer(WarningType_Vote, when, inputarray); SetupWarningTimer(WarningType_Vote, when, inputarray);
//InitiateVote(when, inputarray);
return 0; return 0;
} }