diff --git a/addons/sourcemod/scripting/ghostdm.sp b/addons/sourcemod/scripting/ghostdm.sp index caedeced..a0c83b25 100644 --- a/addons/sourcemod/scripting/ghostdm.sp +++ b/addons/sourcemod/scripting/ghostdm.sp @@ -732,7 +732,7 @@ bool IsClientValid(int client, bool nobots = false) { if (client > 0 && client <= MaxClients) { - if (!IsClientConnected(client) || IsClientSourceTV(client) || !IsClientInGame(client)) + if (IsClientSourceTV(client) || !IsClientInGame(client)) { return false; } diff --git a/addons/sourcemod/scripting/include/multicolors/colors.inc b/addons/sourcemod/scripting/include/multicolors/colors.inc index f288a0cb..15b0d219 100644 --- a/addons/sourcemod/scripting/include/multicolors/colors.inc +++ b/addons/sourcemod/scripting/include/multicolors/colors.inc @@ -630,7 +630,7 @@ stock int C_ShowActivity(int client, const char[] format, any ...) bool display_in_chat = false; if (client != 0) { - if (client < 0 || client > MaxClients || !IsClientConnected(client)) + if (client < 0 || client > MaxClients || !IsClientInGame(client)) ThrowError("Client index %d is invalid", client); GetClientName(client, name, sizeof(name)); @@ -744,7 +744,7 @@ stock int C_ShowActivityEx(int client, const char[] tag, const char[] format, an bool display_in_chat = false; if (client != 0) { - if (client < 0 || client > MaxClients || !IsClientConnected(client)) + if (client < 0 || client > MaxClients || !IsClientInGame(client)) ThrowError("Client index %d is invalid", client); GetClientName(client, name, sizeof(name)); @@ -859,7 +859,7 @@ stock int C_ShowActivity2(int client, const char[] tag, const char[] format, any char sign[MAX_NAME_LENGTH] = "ADMIN"; if (client != 0) { - if (client < 0 || client > MaxClients || !IsClientConnected(client)) + if (client < 0 || client > MaxClients || !IsClientInGame(client)) ThrowError("Client index %d is invalid", client); GetClientName(client, name, sizeof(name)); diff --git a/addons/sourcemod/scripting/include/multicolors/morecolors.inc b/addons/sourcemod/scripting/include/multicolors/morecolors.inc index 4eb460a6..48724633 100644 --- a/addons/sourcemod/scripting/include/multicolors/morecolors.inc +++ b/addons/sourcemod/scripting/include/multicolors/morecolors.inc @@ -422,7 +422,7 @@ stock int MC_ShowActivity(int client, const char[] format, any ...) bool display_in_chat = false; if (client != 0) { - if (client < 0 || client > MaxClients || !IsClientConnected(client)) + if (client < 0 || client > MaxClients || !IsClientInGame(client)) ThrowError("Client index %d is invalid", client); GetClientName(client, name, sizeof(name)); @@ -535,7 +535,7 @@ stock int MC_ShowActivityEx(int client, const char[] tag, const char[] format, a bool display_in_chat = false; if (client != 0) { - if (client < 0 || client > MaxClients || !IsClientConnected(client)) + if (client < 0 || client > MaxClients || !IsClientInGame(client)) ThrowError("Client index %d is invalid", client); GetClientName(client, name, sizeof(name)); @@ -649,7 +649,7 @@ stock int MC_ShowActivity2(int client, const char[] tag, const char[] format, an char sign[MAX_NAME_LENGTH] = "ADMIN"; if (client != 0) { - if (client < 0 || client > MaxClients || !IsClientConnected(client)) + if (client < 0 || client > MaxClients || !IsClientInGame(client)) ThrowError("Client index %d is invalid", client); GetClientName(client, name, sizeof(name)); diff --git a/addons/sourcemod/scripting/include/ttt.inc b/addons/sourcemod/scripting/include/ttt.inc index 30529e7e..743c4420 100644 --- a/addons/sourcemod/scripting/include/ttt.inc +++ b/addons/sourcemod/scripting/include/ttt.inc @@ -629,17 +629,12 @@ stock bool TTT_IsClientValid(int client) { if (client > 0 && client <= MaxClients) { - if (!IsClientConnected(client)) - { - return false; - } - - if (IsClientSourceTV(client)) + if (!IsClientInGame(client)) { return false; } - if (!IsClientInGame(client)) + if (IsClientSourceTV(client)) { return false; } diff --git a/addons/sourcemod/scripting/tests/commands.sp b/addons/sourcemod/scripting/tests/commands.sp index 3cccabc0..6aba3676 100644 --- a/addons/sourcemod/scripting/tests/commands.sp +++ b/addons/sourcemod/scripting/tests/commands.sp @@ -24,7 +24,7 @@ public Action Command_CheckGOTV(int client, int args) { for (int i = 1; i <= MaxClients; i++) { - ReplyToCommand(client, "i: %d, Name: %N, IsFakeClient: %d, IsClientSourceTV: %d, IsClientConnected: %d, IsClientInGame: %d, IsPlayerAlive: %d", i, i, IsFakeClient(i), IsClientSourceTV(i), IsClientConnected(i), IsClientInGame(i), IsPlayerAlive(i)); + ReplyToCommand(client, "i: %d, Name: %N, IsFakeClient: %d, IsClientSourceTV: %d, IsClientInGame: %d, IsPlayerAlive: %d", i, i, IsFakeClient(i), IsClientSourceTV(i), IsClientInGame(i), IsPlayerAlive(i)); } }