R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Server: fix bug in CC_CreateFakePlayer_f

Browse Source 
- We don't need to call CVEngineServer::LockNetworkStringTables, as CVEngineServer::CreateFakeClient already does this.
- We should never run CVEngineServer::CreateFakeClient() and CServerGameClients::ClientFullyConnect() when we aren't doing this from the server frame thread, or when we are doing it outside the server frame thread while its active. We not wait and help with other jobs until the server frame thread is finished before adding our bot.
- Removed team number check, this is already performed in CClient::SetTeam().
This commit is contained in:
Kawe Mazidjatari 2024-12-05 20:10:07 +01:00
parent 6a8eb40930
commit 8490344d93
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/game/server/player.cpp
View File

@ -258,23 +258,19 @@ static void CC_CreateFakePlayer_f(const CCommand& args)
if (numPlayers >= g_ServerGlobalVariables->maxClients)
return;
const char* playerName = args.Arg(1);
const char* const playerName = args.Arg(1);
const int teamNum = atoi(args.Arg(2));
int teamNum = atoi(args.Arg(2));
const int maxTeams = int(g_pServer->GetMaxTeams()) + 1;
// Clamp team count, going above the limit will
// cause a crash. Going below 0 means that the
// engine will assign the bot to the last team.
if (teamNum > maxTeams)
teamNum = maxTeams;
g_pEngineServer->LockNetworkStringTables(true);
// The following code must either run inside the server frame thread, or
// after it has finished. Lock here and help with other jobs until the
// server has finished running the frame.
ThreadJoinServerJob();
// note(amos): if you call CServer::CreateFakeClient() directly, you also
// need to lock the string tables with LockNetworkStringTables. The
// CVEngineServer method automatically locks and unlocks the string tables.
const edict_t nHandle = g_pEngineServer->CreateFakeClient(playerName, teamNum);
g_pServerGameClients->ClientFullyConnect(nHandle, false);
g_pEngineServer->LockNetworkStringTables(false);
}
static ConCommand sv_addbot("sv_addbot", CC_CreateFakePlayer_f, "Creates a bot on the server", FCVAR_RELEASE);