Skip to content

feat(logic): Always kick fake client first #25

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
Rushaway wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(logic): Always kick fake client first #25

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
44 changes: 26 additions & 18 deletions addons/sourcemod/scripting/ReservedSlot.sp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public Plugin myinfo =
name = "Reserved Slot",
author = "BotoX, .Rushaway",
description = "Provides extended reserved slots",
version = "1.2.4",
version = "1.3.0",
url = ""
};

Expand Down Expand Up @@ -84,13 +84,10 @@ public bool OnClientPreConnectEx(const char[] sName, char sPassword[255], const
return true;

AdminId admin = FindAdminByIdentity(AUTHMETHOD_STEAM, sSteam32ID);
int Immunity = 0;

if(admin != INVALID_ADMIN_ID && GetAdminFlag(admin, Admin_Reservation))
{
Immunity = GetAdminImmunityLevel(admin);

if(!KickValidClient(sName, sSteam32ID, admin, Immunity))
if(!KickValidClient(sName))
{
Format(sRejectReason, sizeof(sRejectReason), "No reserved slot available yet, sorry.");
return false;
Expand All @@ -101,7 +98,7 @@ public bool OnClientPreConnectEx(const char[] sName, char sPassword[255], const
return true;
}

stock bool KickValidClient(const char[] sName, const char[] sSteam32ID, AdminId admin, int Immunity)
stock bool KickValidClient(const char[] sName)
{
int HighestValue[4] = {0, ...};
int HighestValueClient[4] = {0, ...};
Expand All @@ -111,9 +108,20 @@ stock bool KickValidClient(const char[] sName, const char[] sSteam32ID, AdminId

for(int client = 1; client <= MaxClients; client++)
{
if(!IsClientInGame(client) || IsFakeClient(client) || IsClientSourceTV(client))
if(!IsClientInGame(client) || IsClientSourceTV(client))
continue;

// Always prioritize kicking bots before real players.
if(IsFakeClient(client))
{
if(!HighestValueClient[0])
{
HighestValue[0] = 1;
HighestValueClient[0] = client;
}
continue;
}

int flags = GetUserFlagBits(client);

if(flags & ADMFLAG_ROOT)
Expand Down Expand Up @@ -145,10 +153,10 @@ stock bool KickValidClient(const char[] sName, const char[] sSteam32ID, AdminId
{
if(!Donator || IdleTime > 30)
{
if(IdleTime > HighestValue[0])
if(IdleTime > HighestValue[1])
{
HighestValue[0] = IdleTime;
HighestValueClient[0] = client;
HighestValue[1] = IdleTime;
HighestValueClient[1] = client;
}
}
}
Expand All @@ -159,10 +167,10 @@ stock bool KickValidClient(const char[] sName, const char[] sSteam32ID, AdminId
*/
if(!Donator && iTeam > CS_TEAM_SPECTATOR && !IsPlayerAlive(client))
{
if(IdleTime > 30 && IdleTime > HighestValue[1])
if(IdleTime > 30 && IdleTime > HighestValue[2])
{
HighestValue[1] = IdleTime;
HighestValueClient[1] = client;
HighestValue[2] = IdleTime;
HighestValueClient[2] = client;
}
}
/* Dead non-donator with IdleTime > 30 */
Expand All @@ -172,10 +180,10 @@ stock bool KickValidClient(const char[] sName, const char[] sSteam32ID, AdminId
*
if(!Donator && IsPlayerAlive(client) && !HasItem)
{
if(IdleTime > 30 && IdleTime > HighestValue[2])
if(IdleTime > 30 && IdleTime > HighestValue[3])
{
HighestValue[2] = IdleTime;
HighestValueClient[2] = client;
HighestValue[3] = IdleTime;
HighestValueClient[3] = client;
}
}
* Alive non-donator with IdleTime > 30 */
Expand All @@ -186,15 +194,15 @@ stock bool KickValidClient(const char[] sName, const char[] sSteam32ID, AdminId
{
if(HighestValue[i])
{
ExecuteKickValidClient(HighestValueClient[i], sName, sSteam32ID, admin, Immunity);
ExecuteKickValidClient(HighestValueClient[i], sName);
return true;
}
}

return false;
}

stock void ExecuteKickValidClient(int client, const char[] sName, const char[] sSteam32ID, AdminId admin, int Immunity)
stock void ExecuteKickValidClient(int client, const char[] sName)
{
KickClientEx(client, "Kicked for reserved slot. (%s joined).", sName);
}