reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2025-01-17 17:17:56 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #142 from WPMGPRoSToTeMa/master

Browse Source 
Fixed crash when player was kicked in ClientPutInServer
This commit is contained in:
theAsmodai 2016-01-28 16:27:48 +03:00
commit f74d3842da
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rehlds/engine/sv_main.cpp
View File

@ -1463,6 +1463,12 @@ void SV_WriteSpawn(sizebuf_t *msg)
gGlobalVariables.time = g_psv.time; gGlobalVariables.time = g_psv.time;
gEntityInterface.pfnClientPutInServer(sv_player); gEntityInterface.pfnClientPutInServer(sv_player);
g_psv.state = ss_active; g_psv.state = ss_active;
#ifdef REHLDS_FIXES
// Client was kicked in ClientPutInServer
if (!host_client->connected)
return;
#endif // REHLDS_FIXES
} }
#ifndef REHLDS_FIXES #ifndef REHLDS_FIXES
@ -1680,6 +1686,13 @@ void SV_Spawn_f(void)
{ {
SZ_Write(&msg, g_psv.signon.data, g_psv.signon.cursize); SZ_Write(&msg, g_psv.signon.data, g_psv.signon.cursize);
SV_WriteSpawn(&msg); SV_WriteSpawn(&msg);
#ifdef REHLDS_FIXES
// Client was kicked in ClientPutInServer
if (!host_client->connected)
return;
#endif // REHLDS_FIXES
SV_WriteVoiceCodec(&msg); SV_WriteVoiceCodec(&msg);
Netchan_CreateFragments(TRUE, &host_client->netchan, &msg); Netchan_CreateFragments(TRUE, &host_client->netchan, &msg);
Netchan_FragSend(&host_client->netchan); Netchan_FragSend(&host_client->netchan);