From 326caccb0640b53754b5acdacb39d995ee9a14f3 Mon Sep 17 00:00:00 2001 From: mourningsickness Date: Sat, 12 Jul 2025 10:37:46 -0700 Subject: [PATCH 1/3] shavit-zones.sp - make it so slay/stoptimer zones don't apply if paused rip skronk's hour long bhop_thc time --- addons/sourcemod/scripting/shavit-zones.sp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/sourcemod/scripting/shavit-zones.sp b/addons/sourcemod/scripting/shavit-zones.sp index 9c5ce72f..170e555c 100644 --- a/addons/sourcemod/scripting/shavit-zones.sp +++ b/addons/sourcemod/scripting/shavit-zones.sp @@ -5347,7 +5347,7 @@ public void StartTouchPost(int entity, int other) case Zone_Slay: { - if (status != Timer_Stopped) + if (status == Timer_Running) { Shavit_StopTimer(other); ACTUALLY_ForcePlayerSuicide(other); @@ -5357,7 +5357,7 @@ public void StartTouchPost(int entity, int other) case Zone_Stop: { - if(status != Timer_Stopped) + if(status == Timer_Running) { Shavit_StopTimer(other); Shavit_PrintToChat(other, "%T", "ZoneStopEnter", other, gS_ChatStrings.sWarning, gS_ChatStrings.sVariable2, gS_ChatStrings.sWarning); From 0b0be25c78a1479e0dc16e855805607da31de948 Mon Sep 17 00:00:00 2001 From: mourningsickness Date: Mon, 14 Jul 2025 17:46:59 -0700 Subject: [PATCH 2/3] shavit-misc.sp - don't stop timer on tpto if paused with pause movement enabled (#1249) --- addons/sourcemod/scripting/shavit-misc.sp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/addons/sourcemod/scripting/shavit-misc.sp b/addons/sourcemod/scripting/shavit-misc.sp index e37e8954..ccf26fb9 100644 --- a/addons/sourcemod/scripting/shavit-misc.sp +++ b/addons/sourcemod/scripting/shavit-misc.sp @@ -1929,7 +1929,16 @@ bool Teleport(int client, int targetserial) float vecPosition[3]; GetClientAbsOrigin(iTarget, vecPosition); - Shavit_StopTimer(client); + if(Shavit_GetTimerStatus(client) == Timer_Running || !gCV_PauseMovement.BoolValue) + { + if(ShouldDisplayStopWarning(client)) + { + gI_LastStopInfo[client] = targetserial; + OpenStopWarningMenu(client, DoTeleport); + return true; + } + Shavit_StopTimer(client); + } TeleportEntity(client, vecPosition, NULL_VECTOR, NULL_VECTOR); @@ -2040,6 +2049,12 @@ void DoStopTimer(int client) Shavit_StopTimer(client); } +void DoTeleport(int client) +{ + Shavit_StopTimer(client); + Teleport(client, gI_LastStopInfo[client]); +} + void OpenStopWarningMenu(int client, StopTimerCallback after) { gH_AfterWarningMenu[client] = after; From 378a2eae700c218e1d2568c4ae83241009ca49e4 Mon Sep 17 00:00:00 2001 From: rtldg Date: Tue, 15 Jul 2025 01:10:56 +0000 Subject: [PATCH 3/3] Include eventqueuefixfix in release zips --- .github/workflows/ci.yml | 3 +++ README.md | 1 + 2 files changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 82ea637e..ca30d635 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,6 +33,9 @@ jobs: wget https://github.com/hermansimensen/eventqueue-fix/archive/refs/heads/main.tar.gz tar --strip-components=1 -xvzf main.tar.gz -C addons/sourcemod rm -rf *.zip *.tar.gz addons/sourcemod/.git* addons/sourcemod/LICENSE + wget https://github.com/srcwr/eventqueuefixfix/releases/download/v1.0.1/eventqueuefixfix-v1.0.1-def5b0e-windows-x32.zip + unzip eventqueuefixfix-v1.0.1-def5b0e-windows-x32.zip "addons/sourcemod/extensions/*" + rm "addons/sourcemod/extensions/eventqueuefixfix.pdb" - name: Run compiler shell: bash diff --git a/README.md b/README.md index 18915a66..e05a5249 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ Includes a records system, map zones (start/end marks etc), bonuses, HUD with us * [eventqueuefix](https://github.com/hermansimensen/eventqueue-fix) * Allows for timescaling boosters and is used to fix some exploits. (Use this instead of `boosterfix`) * (included in bhoptimer release zips) + * Along with using [eventqueuefixfix](https://github.com/srcwr/eventqueuefixfix) at the same time to fix eventqueuefix on Windows after the 2025-02-18 update. * [SteamWorks](https://forums.alliedmods.net/showthread.php?t=229556) * Used to grab `{serverip}` in advertisements. * [DynamicChannels](https://github.com/Vauff/DynamicChannels)