# HG changeset patch
# User Adam Kaminski <kaminskiadam9@gmail.com>
# Date 1613936572 18000
#      Sun Feb 21 14:42:52 2021 -0500
# Node ID cf2d3cc7a6da85a8e1188818469e49d81d358d82
# Parent  d05cc188c8307ad2f360976c58b714bdb13cfb1e
Blacklisted the ignore, forcespec, kick, and ban CCMDs from ConsoleCommand.

diff -r d05cc188c830 -r cf2d3cc7a6da src/chat.cpp
--- a/src/chat.cpp	Tue Feb 16 12:31:30 2021 -0500
+++ b/src/chat.cpp	Sun Feb 21 14:42:52 2021 -0500
@@ -1467,6 +1467,10 @@
 //
 void chat_IgnorePlayer( FCommandLine &argv, const ULONG ulPlayer )
 {
+	// [AK] This function may not be used by ConsoleCommand.
+	if ( ACS_IsCalledFromConsoleCommand( ))
+		return;
+
 	// Print the explanation message.
 	if ( argv.argc( ) < 2 )
 	{
@@ -1538,6 +1542,10 @@
 //
 void chat_UnignorePlayer( FCommandLine &argv, const ULONG ulPlayer )
 {
+	// [AK] This function may not be used by ConsoleCommand.
+	if ( ACS_IsCalledFromConsoleCommand( ))
+		return;
+
 	// Print the explanation message.
 	if ( argv.argc( ) < 2 )
 	{
diff -r d05cc188c830 -r cf2d3cc7a6da src/sv_ban.cpp
--- a/src/sv_ban.cpp	Tue Feb 16 12:31:30 2021 -0500
+++ b/src/sv_ban.cpp	Sun Feb 21 14:42:52 2021 -0500
@@ -56,6 +56,7 @@
 #include "sv_ban.h"
 #include "version.h"
 #include "v_text.h"
+#include "p_acs.h"
 
 //--------------------------------------------------------------------------------------------------------------------------------------------------
 //-- VARIABLES -------------------------------------------------------------------------------------------------------------------------------------
@@ -556,6 +557,10 @@
 //
 CCMD( ban_idx )
 {
+	// [AK] This function may not be used by ConsoleCommand.
+	if ( ACS_IsCalledFromConsoleCommand( ))
+		return;
+
 	// Only the server can ban players!
 	if ( NETWORK_GetState( ) != NETSTATE_SERVER )
 		return;
@@ -580,6 +585,10 @@
 {
 	ULONG	ulIdx;
 
+	// [AK] This function may not be used by ConsoleCommand.
+	if ( ACS_IsCalledFromConsoleCommand( ))
+		return;
+
 	// Only the server can ban players!
 	if ( NETWORK_GetState( ) != NETSTATE_SERVER )
 		return;
@@ -615,6 +624,10 @@
 //
 CCMD( addban )
 {
+	// [AK] This function may not be used by ConsoleCommand.
+	if ( ACS_IsCalledFromConsoleCommand( ))
+		return;
+
 	if ( argv.argc( ) < 3 )
 	{
 		Printf( "Usage: addban <IP address> <duration> [comment]\nDescription: bans the given IP address.\n" );
@@ -640,6 +653,10 @@
 //
 CCMD( delban )
 {
+	// [AK] This function may not be used by ConsoleCommand.
+	if ( ACS_IsCalledFromConsoleCommand( ))
+		return;
+
 	if ( argv.argc( ) < 2 )
 	{
 		Printf( "Usage: delban <IP address>\n" );
@@ -655,6 +672,10 @@
 //
 CCMD( addbanexemption )
 {
+	// [AK] This function may not be used by ConsoleCommand.
+	if ( ACS_IsCalledFromConsoleCommand( ))
+		return;
+
 	if ( argv.argc( ) < 2 )
 	{
 		Printf( "Usage: addbanexemption <IP address> [comment]\n" );
@@ -670,6 +691,10 @@
 //
 CCMD( delbanexemption )
 {
+	// [AK] This function may not be used by ConsoleCommand.
+	if ( ACS_IsCalledFromConsoleCommand( ))
+		return;
+
 	if ( argv.argc( ) < 2 )
 	{
 		Printf( "Usage: delbanexemption <IP address>\n" );
@@ -717,6 +742,10 @@
 //
 CCMD( clearbans )
 {
+	// [AK] This function may not be used by ConsoleCommand.
+	if ( ACS_IsCalledFromConsoleCommand( ))
+		return;
+
 	SERVERBAN_ClearBans( );
 }
 
@@ -724,5 +753,9 @@
 //
 CCMD( reloadbans )
 {
+	// [AK] This function may not be used by ConsoleCommand.
+	if ( ACS_IsCalledFromConsoleCommand( ))
+		return;
+
 	serverban_LoadBansAndBanExemptions( );
 }
diff -r d05cc188c830 -r cf2d3cc7a6da src/sv_main.cpp
--- a/src/sv_main.cpp	Tue Feb 16 12:31:30 2021 -0500
+++ b/src/sv_main.cpp	Sun Feb 21 14:42:52 2021 -0500
@@ -7057,6 +7057,10 @@
 
 CCMD( kick_idx )
 {
+	// [AK] This function may not be used by ConsoleCommand.
+	if ( ACS_IsCalledFromConsoleCommand( ))
+		return;
+
 	// Only the server can boot players!
 	if ( NETWORK_GetState( ) != NETSTATE_SERVER )
 		return;
@@ -7082,6 +7086,10 @@
 
 CCMD( kick_ip )
 {
+	// [AK] This function may not be used by ConsoleCommand.
+	if ( ACS_IsCalledFromConsoleCommand( ))
+		return;
+
 	// Only the server can boot players!
 	if ( NETWORK_GetState( ) != NETSTATE_SERVER )
 		return;
@@ -7109,6 +7117,10 @@
 	ULONG	ulIdx;
 	char	szPlayerName[64];
 
+	// [AK] This function may not be used by ConsoleCommand.
+	if ( ACS_IsCalledFromConsoleCommand( ))
+		return;
+
 	// Only the server can boot players!
 	if ( NETWORK_GetState( ) != NETSTATE_SERVER )
 		return;
@@ -7150,6 +7162,10 @@
 //
 CCMD( forcespec_idx )
 {
+	// [AK] This function may not be used by ConsoleCommand.
+	if ( ACS_IsCalledFromConsoleCommand( ))
+		return;
+
 	// Only the server can boot players!
 	if ( NETWORK_GetState( ) != NETSTATE_SERVER )
 		return;
@@ -7177,6 +7193,10 @@
 //
 CCMD( forcespec )
 {
+	// [AK] This function may not be used by ConsoleCommand.
+	if ( ACS_IsCalledFromConsoleCommand( ))
+		return;
+
 	// Only the server can boot players!
 	if ( NETWORK_GetState( ) != NETSTATE_SERVER )
 		return;