From 061cf864cc2b54c6c9e5f7c5719fcc923ea03e96 Mon Sep 17 00:00:00 2001 From: Nicolai Cornelis Date: Mon, 10 Apr 2023 20:48:35 +0200 Subject: [PATCH 1/3] Reset g_ReadyTimeWaitingUsed when changing map (cherry picked from commit 094ca4b96a6a1ba10c4a101c484b391c2750775e) --- scripting/get5.sp | 1 + 1 file changed, 1 insertion(+) diff --git a/scripting/get5.sp b/scripting/get5.sp index 24a713e1..8ec259c0 100644 --- a/scripting/get5.sp +++ b/scripting/get5.sp @@ -967,6 +967,7 @@ static Action Timer_CheckReady(Handle timer) { return Plugin_Continue; } if (IsDoingRestoreOrMapChange()) { + g_ReadyTimeWaitingUsed = 0; LogDebug("Timer_CheckReady: Waiting for restore or map change"); return Plugin_Continue; } From f1a26705f50a3f98c63d023713daaad0838b6ce0 Mon Sep 17 00:00:00 2001 From: Nicolai Cornelis Date: Mon, 10 Apr 2023 20:50:56 +0200 Subject: [PATCH 2/3] version --- CHANGELOG.md | 4 ++-- scripting/get5/version.sp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc5f1d44..09ba9405 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ Whenever you update your Get5 plugin, remember to **always** update the `transla Please see the [installation instructions](https://splewis.github.io/get5/latest/installation/#installation) for details. -# 0.14.2 +# 0.14.3 #### 2023-04-10 @@ -27,7 +27,7 @@ Hotfix of stuff that should have been in 0.14.0. # 0.14.0 -*Note: Removed from releases. Please use 0.14.2 instead. All changes below still apply.* +*Note: Removed from releases. Please use 0.14.3 instead. All changes below still apply.* #### 2023-04-08 diff --git a/scripting/get5/version.sp b/scripting/get5/version.sp index 92677c1a..1690e02b 100644 --- a/scripting/get5/version.sp +++ b/scripting/get5/version.sp @@ -1,4 +1,4 @@ -#define PLUGIN_VERSION "0.14.2-dev" +#define PLUGIN_VERSION "0.14.3-dev" // This MUST be the latest version in x.y.z semver format followed by -dev. // If this is not consistently applied, the update-checker might malfunction. // In official releases, the CI flow will remove the -dev suffix when compiling the plugin. From 483ac00fd78c5ac78cbf40f72fbfe6c95f10f001 Mon Sep 17 00:00:00 2001 From: Nicolai Cornelis Date: Mon, 10 Apr 2023 20:53:52 +0200 Subject: [PATCH 3/3] Remember to reset on manual map change --- scripting/get5.sp | 1 + 1 file changed, 1 insertion(+) diff --git a/scripting/get5.sp b/scripting/get5.sp index 8ec259c0..2994266d 100644 --- a/scripting/get5.sp +++ b/scripting/get5.sp @@ -900,6 +900,7 @@ public void OnMapStart() { // If the map is changed while a map timer is counting down, kill the timer. This could happen if // a too long mp_match_restart_delay was set and admins decide to manually intervene. if (g_PendingMapChangeTimer != INVALID_HANDLE) { + g_ReadyTimeWaitingUsed = 0; delete g_PendingMapChangeTimer; LogDebug("Killed g_PendingMapChangeTimer as map was changed."); }