Merge pull request #1015 from splewis/development

0.14.3
splewis · Apr 10, 2023 · 60e1919 · 60e1919
2 parents 70b4bde + 483ac00
commit 60e1919
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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.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.");
   }
@@ -967,6 +968,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;
   }

diff --git 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.