cmod: Workaround to allow bots to join password protected servers

Chomenor · May 9, 2021 · a6942b5 · a6942b5
1 parent 50c8ae6
commit a6942b5
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/code/cmod/cmod_defs.h b/code/cmod/cmod_defs.h
@@ -132,6 +132,9 @@
 // Has some potential for for CPU load spikes, but seems to be generally okay on most maps in testing
 #define CMOD_BOT_RANDOM_GOALS
 
+// [BUGFIX] Workaround to allow bots to join password-protected server
+#define CMOD_BOT_PASSWORD_FIX
+
 // [BUGFIX] Fixes for several issues that can interfere with the server being listed on
 // master servers and/or server browser tools
 #define CMOD_GETSTATUS_FIXES

diff --git a/code/server/sv_init.c b/code/server/sv_init.c
@@ -205,6 +205,19 @@ void SV_GetUserinfo( int index, char *buffer, int bufferSize ) {
 		Com_Error (ERR_DROP, "SV_GetUserinfo: bad index %i", index);
 	}
 	Q_strncpyz( buffer, svs.clients[ index ].userinfo, bufferSize );
+#ifdef CMOD_BOT_PASSWORD_FIX
+	{
+		static cvar_t *passwordCvar;
+		if ( !passwordCvar ) {
+			passwordCvar = Cvar_Get( "g_password", "", 0 );
+		}
+		if ( passwordCvar && passwordCvar->string && passwordCvar->string[0] && Q_stricmp(passwordCvar->string, "none") &&
+				( svs.clients[index].netchan.remoteAddress.type == NA_BOT ||
+				svs.clients[index].netchan.remoteAddress.type == NA_LOOPBACK ) ) {
+			Info_SetValueForKey( buffer, "password", passwordCvar->string );
+		}
+	}
+#endif
 }