Test another potential fix

diff --git a/host_cmd.c b/host_cmd.c
index 66227370b1ea2a22adcbd8c98fafaf14563facd3..2d3d4dd06c051694940a635c7d51244ef5154e3f 100644 (file)
--- 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 3ac17f23d9aa1787270b75c7a6c465c98c18d666..1dcdb76f443e534d49f76ce6659483dd709b8394 100644 (file)
--- 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))
                        {