X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=sv_main.c;h=b817cc97053d977746e799ccb20d95cd16715581;hb=863110d59f30b08b53d29a48aedaf22546f17ad2;hp=39a9d48a6fbce1b5629ee13d870d5303ccd92456;hpb=9cc276c2e36a6fc6cfafd8a0fb6df85e2f644c07;p=xonotic%2Fdarkplaces.git

diff --git a/sv_main.c b/sv_main.c
index 39a9d48a..b817cc97 100644
--- a/sv_main.c
+++ b/sv_main.c
@@ -408,7 +408,8 @@ void SV_ConnectClient (int clientnum, netconn_t *netconnection)
 	strcpy(client->old_name, "unconnected");
 	client->spawned = false;
 	client->edict = PRVM_EDICT_NUM(clientnum+1);
-	client->netconnection->message.allowoverflow = true;		// we can catch it
+	if (client->netconnection)
+		client->netconnection->message.allowoverflow = true;		// we can catch it
 	// updated by receiving "rate" command from client
 	client->rate = NET_MINRATE;
 	// no limits for local player
@@ -1606,36 +1607,6 @@ void SV_CreateBaseline (void)
 }
 
 
-/*
-================
-SV_SendReconnect
-
-Tell all the clients that the server is changing levels
-================
-*/
-void SV_SendReconnect (void)
-{
-#if 1
-	MSG_WriteByte(&sv.reliable_datagram, svc_stufftext);
-	MSG_WriteString(&sv.reliable_datagram, "reconnect\n");
-#else
-	unsigned char data[128];
-	sizebuf_t msg;
-
-	msg.data = data;
-	msg.cursize = 0;
-	msg.maxsize = sizeof(data);
-
-	MSG_WriteChar (&msg, svc_stufftext);
-	MSG_WriteString (&msg, "reconnect\n");
-	NetConn_SendToAll (&msg, 5);
-
-	if (cls.state != ca_dedicated)
-		Cmd_ExecuteString ("reconnect\n", src_command);
-#endif
-}
-
-
 /*
 ================
 SV_SaveSpawnparms
@@ -1748,8 +1719,10 @@ void SV_SpawnServer (const char *server)
 //
 	if (sv.active)
 	{
+		// Tell all the clients that the server is changing levels
 		SV_VM_Begin();
-		SV_SendReconnect();
+		MSG_WriteByte(&sv.reliable_datagram, svc_stufftext);
+		MSG_WriteString(&sv.reliable_datagram, "reconnect\n");
 		SV_VM_End();
 	}
 	else