sm-plugins/bhoptimer
1
0
Fork 0
mirror of https://github.com/shavitush/bhoptimer.git synced 2025-12-06 18:08:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into floppy

Browse Source
This commit is contained in:
rtldg 2025-07-15 01:13:44 +00:00
commit 67ade711d2
4 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci.yml vendored
View File

@ -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

1
README.md
View File

@ -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)

17
addons/sourcemod/scripting/shavit-misc.sp
View File

@ -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;

4
addons/sourcemod/scripting/shavit-zones.sp
View File

@ -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);