UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/alliedmodders/sourcemod into mapchooser-updates

Browse Source
This commit is contained in:
Ross Bemrose 2014-12-22 15:56:18 -05:00
commit 6dff44da54
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/PlayerManager.cpp
View File

@ -536,7 +536,7 @@ bool PlayerManager::OnClientConnect(edict_t *pEntity, const char *pszName, const
if (res) if (res)
{ {
if (!pPlayer->IsAuthorized()) if (!pPlayer->IsAuthorized() && !pPlayer->IsFakeClient())
{ {
m_AuthQueue[++m_AuthQueue[0]] = client; m_AuthQueue[++m_AuthQueue[0]] = client;
} }
@ -622,8 +622,6 @@ void PlayerManager::OnClientPutInServer(edict_t *pEntity, const char *playername
char error[255]; char error[255];
pPlayer->m_bFakeClient = true; pPlayer->m_bFakeClient = true;
pPlayer->UpdateAuthIds();
pPlayer->Authorize();
/* /*
* While we're already filtered to just bots, we'll do other checks to * While we're already filtered to just bots, we'll do other checks to
@ -710,6 +708,8 @@ void PlayerManager::OnClientPutInServer(edict_t *pEntity, const char *playername
cell_t res; cell_t res;
m_clconnect_post->PushCell(client); m_clconnect_post->PushCell(client);
m_clconnect_post->Execute(&res, NULL); m_clconnect_post->Execute(&res, NULL);
pPlayer->Authorize();
const char *steamId = pPlayer->GetSteam2Id(); const char *steamId = pPlayer->GetSteam2Id();

3
plugins/nextmap.sp
View File

@ -63,7 +63,8 @@ public APLRes AskPluginLoad2(Handle myself, bool late, char[] error, int err_max
|| StrEqual(game, "left4dead2", false) || StrEqual(game, "left4dead2", false)
|| StrEqual(game, "garrysmod", false) || StrEqual(game, "garrysmod", false)
|| StrEqual(game, "swarm", false) || StrEqual(game, "swarm", false)
|| StrEqual(game, "dota", false)) || StrEqual(game, "dota", false)
|| GetEngineVersion() == Engine_Insurgency)
{ {
strcopy(error, err_max, "Nextmap is incompatible with this game"); strcopy(error, err_max, "Nextmap is incompatible with this game");
return APLRes_SilentFailure; return APLRes_SilentFailure;