Commit: d4b2ea087ca825a23521a330838dceb1291246d8 - zatspg-beta (hg)

This is a fork of Zandronum Beta for TSPG.

Commit MetaInfo

• Revision: d4b2ea087ca825a23521a330838dceb1291246d8 (tree)
• Time: 2022-06-27 00:12:39
• Author: Adam Kaminski <kaminskiadam9@gmai...>
• Commiter: Adam Kaminski

Log Message

Fixed: player names containing bad words weren't being filtered properly.

Change Summary

• modified: src/sv_main.cpp

Incremental Difference

diff -r 3a849bc2e89f -r d4b2ea087ca8 src/sv_main.cpp
--- a/src/sv_main.cpp	Tue Jun 21 20:09:46 2022 -0400
+++ b/src/sv_main.cpp	Sun Jun 26 11:12:39 2022 -0400
@@ -2244,7 +2244,6 @@
 				kickReason = "User name contains illegal characters." ;
 			}
 
-			bool filtered = BADWORDS_ShouldFilter( value.GetChars( ) );
 			FString message;
 
 			// [AK] Don't allow players to name themselves as "server" in order to avert
@@ -2258,10 +2257,13 @@
 			// 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 %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() );
+				message.Format ( "The name '%s' is already in use. ", value.GetChars() );
+				bOverriddenName = true;
+			}
+			// [TSPG] Don't let players include bad words in their names.
+			else if ( BADWORDS_ShouldFilter ( value ) )
+			{
+				message.Format ( "The name '%s' is not allowed. ", value.GetChars() );
 				bOverriddenName = true;
 			}