Added toggle console server command

CHANGELOG.md

@@ -21,6 +21,7 @@ The version control structure on this project is `<mayor>.<minor>.<patch>` where
 - Added new emotes & updated checks
 - Added extra checks for item spawn
 - Added custom door map entity
+- Added toggle console server command
 
 ## 0.18.2
 - Fix death count on scoreboard

code/cgame/cg_servercmds.c

@@ -1384,6 +1384,17 @@ static void CG_ServerCommand( void ) {
 		return;
 	}
 
+	// Tr!Force: [JKMod] Toggle console from server
+	if ( !strcmp(cmd, "jk_cg_toggleConsole") )
+	{
+		if (trap_Key_GetCatcher() & KEYCATCH_CONSOLE) {
+			trap_Key_SetCatcher(0);
+		} else {
+			trap_Key_SetCatcher(KEYCATCH_CONSOLE);
+		}
+		return;
+	}
+
 	CG_Printf( "Unknown client game command: %s\n", cmd );
 }
 

code/game/g_items.c

@@ -2030,9 +2030,10 @@ void G_SpawnItem (gentity_t *ent, gitem_t *item) {
 	// Register the item even if we're going to remove it, as unpatched clients
 	// don't update their item registration on map_restart and we might enable
 	// weapons after a map_restart.
-	if (!itemRegistered[item - bg_itemlist]) { // Tr!Force: [GameGeneral] Save item registered
+	if (!itemRegistered[item - bg_itemlist]) // Tr!Force: [GameGeneral] Save item registered
+	{
 		RegisterItem(item);
-		SaveRegisteredItems();
+		if (level.numConnectedClients) SaveRegisteredItems();
 	}
 
 	if (g_gametype.integer == GT_TOURNAMENT)

jkmod/game/jk_cmds.c

@@ -722,6 +722,18 @@ static void JKMod_Cmd_EngageAuto(gentity_t* ent)
 	return;
 }
 
+/*
+=====================================================================
+Send toggle console function
+=====================================================================
+*/
+void JKMod_Cmd_ToggleConsole(gentity_t *ent)
+{
+	if (ent->client->pers.jkmodPers.clientPlugin) {
+		trap_SendServerCommand(ent - g_entities, "jk_cg_toggleConsole");
+	}
+}
+
 /*
 =====================================================================
 Who is / status function
@@ -1878,6 +1890,7 @@ void JKMod_Say(gentity_t *ent, int mode, qboolean arg0)
 	else if (Q_stricmp(p, "!where") == 0)
 	{
 		JKMod_Cmd_WhoIs(ent);
+		JKMod_Cmd_ToggleConsole(ent);
 	}
 	// Player stats
 	else if (Q_stricmp(p, "!status") == 0)

jkmod/game/jk_local.h

@@ -430,6 +430,7 @@ void		JKMod_ClientCleanName(const char *in, char *out, int outSize, gentity_t *e
 // jk_cmds.c
 qboolean	JKMod_IgnoreClientCheck(int option, int ignorer, int ignored);
 void		JKMod_IgnoreClientClear(int ignored);
+void		JKMod_Cmd_ToggleConsole(gentity_t *ent);
 void		JKMod_Cmd_WhoIs(gentity_t *ent);
 void		JKMod_CallVote(gentity_t *ent);
 void		JKMod_EngageDuel(gentity_t *ent, int type);