From: Mario <zacjardine@y7mail.com>
Date: Thu, 29 Jan 2015 17:13:21 +0000 (+1100)
Subject: Test another potential fix
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f2742cdf06baf8bac8cd7dc329ef192813ef9eee;p=xonotic%2Fdarkplaces.git

Test another potential fix
---

diff --git a/host_cmd.c b/host_cmd.c
index 66227370..2d3d4dd0 100644
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -1824,7 +1824,6 @@ static void Host_PreSpawn_f (void)
 	if (host_client->prespawned)
 	{
 		Con_Print("prespawn not valid -- already prespawned\n");
-		SV_DropClient (false); // kicked
 		return;
 	}
 	host_client->prespawned = true;
diff --git a/sv_user.c b/sv_user.c
index 3ac17f23..1dcdb76f 100644
--- a/sv_user.c
+++ b/sv_user.c
@@ -859,7 +859,7 @@ void SV_ReadClientMessage(void)
 				*q = 0;
 			if (strncasecmp(s, "spawn", 5) == 0
 			 || strncasecmp(s, "begin", 5) == 0
-			 || strncasecmp(s, "prespawn", 8) == 0)
+			 || (strncasecmp(s, "prespawn", 8) == 0 && !src_client->prespawned))
 				Cmd_ExecuteString (s, src_client, true);
 			else if (PRVM_serverfunction(SV_ParseClientCommand))
 			{