Commit: 77ce14c3ff09ddadccf2521fde45fd330202c093 - zatspg-beta (hg)

This is a fork of Zandronum Beta for TSPG.

Commit MetaInfo

• Revision: 77ce14c3ff09ddadccf2521fde45fd330202c093 (tree)
• Time: 2022-03-12 10:36:49
• Author: Joshua Surace <doomjoshuaboy@live...>
• Commiter: Joshua Surace

Log Message

Fixed the issue when Bad Words Supposed to filter

Change Summary

• modified: src/sv_main.cpp

Incremental Difference

diff -r 1a0631efaa05 -r 77ce14c3ff09 src/sv_main.cpp
--- a/src/sv_main.cpp	Mon Dec 13 11:25:36 2021 +1100
+++ b/src/sv_main.cpp	Sat Mar 12 12:36:49 2022 +1100
@@ -2257,7 +2257,10 @@
 			// If so, give the player a generic unused name and inform the client.
 			else if ( PLAYER_NameUsed ( value, g_lCurrentClient ) )
 			{
-				message.Format ( "The name '%s' is already in use. ", value.GetChars() );
+				message.Format ( "The name '%s' is %s. ", value.GetChars(), ( filtered ? "not allowed" : "already in use" ) );
+ 				value = PLAYER_GenerateUniqueName();
+				message.AppendFormat ( "You are renamed to '%s'.\n", value.GetChars() );
+				message.AppendFormat ( "You have been renamed to '%s'.\n", value.GetChars() );
 				bOverriddenName = true;
 			}
 
@@ -5879,14 +5882,16 @@
 			SERVER_KickPlayer( ulPlayer, "Client sent an excessively long chat string" );
 			return ( true );
 		}
-
-		SERVER_SendChatMessage( ulPlayer, ulChatMode, pszChatString, ulReceiver );
+		
 		if ( BADWORDS_ShouldFilter( pszChatString ) )
 		{
 			SERVER_PrintfPlayer(ulPlayer, "Your message was discarded because it contained inappropriate language. Please note that attempts to circumvent this system may result in you being banned.\n");
 			return ( false );
 		}
 
+		SERVER_SendChatMessage( ulPlayer, ulChatMode, pszChatString, ulReceiver );
+
+
 		return ( false );
 	}
 }