From a65e8ab5004713520b97b511a4a55b43c5a2819b Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sat, 1 Feb 2020 18:10:58 -0800
Subject: [PATCH 1/3] Add missing conditions to CleanupPlayerName

---
 src/d_netcmd.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index 23ec00b2e..b74a8a76d 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -1010,6 +1010,17 @@ static void CleanupPlayerName(INT32 playernum, const char *newname)
 
 		tmpname = p;
 
+		do
+		{
+			/* from EnsurePlayerNameIsGood */
+			if (!isprint(*p) || *p == ';' || (UINT8)*p >= 0x80)
+				break;
+		}
+		while (*++p) ;
+
+		if (*p)/* bad char found */
+			break;
+
 		// Remove trailing spaces.
 		p = &tmpname[strlen(tmpname)-1]; // last character
 		while (*p == ' ' && p >= tmpname)

From 9192e1eade9ba21161f1c0b32bc7f464c444c56b Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sat, 1 Feb 2020 18:20:35 -0800
Subject: [PATCH 2/3] Clean player name before joining!!!

---
 src/d_clisrv.c | 6 ++++++
 src/d_netcmd.c | 2 +-
 src/d_netcmd.h | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 704fc0901..bcae17aa3 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -1275,8 +1275,14 @@ static boolean CL_SendJoin(void)
 	netbuffer->u.clientcfg.localplayers = localplayers;
 	netbuffer->u.clientcfg.version = VERSION;
 	netbuffer->u.clientcfg.subversion = SUBVERSION;
+
+	CleanupPlayerName(consoleplayer, cv_playername.zstring);
+	if (splitscreen)
+		CleanupPlayerName(1, cv_playername2.zstring);/* 1 is a HACK? oh no */
+
 	strncpy(netbuffer->u.clientcfg.names[0], cv_playername.zstring, MAXPLAYERNAME);
 	strncpy(netbuffer->u.clientcfg.names[1], cv_playername2.zstring, MAXPLAYERNAME);
+
 	return HSendPacket(servernode, true, 0, sizeof (clientconfig_pak));
 }
 
diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index b74a8a76d..cfd2162c5 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -982,7 +982,7 @@ boolean EnsurePlayerNameIsGood(char *name, INT32 playernum)
   *     SetPlayerName
   * \author Graue <graue@oceanbase.org>
   */
-static void CleanupPlayerName(INT32 playernum, const char *newname)
+void CleanupPlayerName(INT32 playernum, const char *newname)
 {
 	char *buf;
 	char *p;
diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index 8f857c6db..f258cde62 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -194,6 +194,7 @@ typedef union {
 // add game commands, needs cleanup
 void D_RegisterServerCommands(void);
 void D_RegisterClientCommands(void);
+void CleanupPlayerName(INT32 playernum, const char *newname);
 boolean EnsurePlayerNameIsGood(char *name, INT32 playernum);
 void D_SendPlayerConfig(void);
 void Command_ExitGame_f(void);

From 937f18dee77eedb72c43126fa3d05ce103834260 Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Sat, 1 Feb 2020 18:22:03 -0800
Subject: [PATCH 3/3] Remove Player 0

---
 src/d_netcmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/d_netcmd.c b/src/d_netcmd.c
index cfd2162c5..35f23ab27 100644
--- a/src/d_netcmd.c
+++ b/src/d_netcmd.c
@@ -624,7 +624,7 @@ void D_RegisterClientCommands(void)
 	// Set default player names
 	// Monster Iestyn (12/08/19): not sure where else I could have actually put this, but oh well
 	for (i = 0; i < MAXPLAYERS; i++)
-		sprintf(player_names[i], "Player %d", i);
+		sprintf(player_names[i], "Player %d", 1 + i);
 
 	if (dedicated)
 		return;