Skip to content

Auto warden timer fix #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Auto warden timer fix #403

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 9 additions & 21 deletions addons/sourcemod/scripting/MyJailbreak/warden.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,12 +845,7 @@ public void Event_PlayerDeath(Event event, const char[] name, bool dontBroadcast
EmitSoundToAllAny(g_sUnWarden);
}

// delete g_hTimerOpen; // why delete don't work?
if (g_hTimerRandom != null)
{
KillTimer(g_hTimerRandom);
}
g_hTimerRandom = null;
delete g_hTimerRandom;

g_hTimerRandom = CreateTimer(gc_fRandomTimer.FloatValue, Timer_ChooseRandom);

Expand Down Expand Up @@ -891,12 +886,7 @@ public void Event_PostRoundStart(Event event, const char[] name, bool dontBroadc

if ((g_iWarden == -1) && gc_bBecomeWarden.BoolValue && !gc_bChoiceWarden.BoolValue)
{
// delete g_hTimerOpen; // why delete don't work?
if (g_hTimerRandom != null)
{
KillTimer(g_hTimerRandom);
}
g_hTimerRandom = null;
delete g_hTimerRandom;

g_hTimerRandom = CreateTimer(gc_fRandomTimer.FloatValue, Timer_ChooseRandom);

Expand Down Expand Up @@ -1420,12 +1410,7 @@ Action SetTheWarden(int client, int caller)
}
}

// delete g_hTimerRandom; // why delete don't work?
if (g_hTimerRandom != null)
{
KillTimer(g_hTimerRandom);
}
g_hTimerRandom = null;
delete g_hTimerRandom;
}
else CReplyToCommand(client, "%s %t", g_sPrefix, "warden_disabled");

Expand Down Expand Up @@ -1694,9 +1679,10 @@ public int Handler_SetWardenOverwrite(Menu menu, MenuAction action, int client,
// Choose a random Warden after a defined time
public Action Timer_ChooseRandom(Handle timer)
{
g_hTimerRandom = null;

if (!gc_bPlugin.BoolValue || !g_bEnabled || (g_bIsLR && gc_bRemoveLR.BoolValue) || g_iWarden != -1 || !gc_bChooseRandom.BoolValue)
{
g_hTimerRandom = null;
return Plugin_Stop;
}

Expand All @@ -1706,9 +1692,11 @@ public Action Timer_ChooseRandom(Handle timer)
{
CPrintToChatAll("%s %t", g_sPrefix, "warden_randomwarden");
}
else CreateTimer (0.1, Timer_ChooseRandom);
else
{
g_hTimerRandom = CreateTimer(0.1, Timer_ChooseRandom);
}

g_hTimerRandom = null;
return Plugin_Stop;
}

Expand Down