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

Fix client listener OnClientAuthorized to match new doc

Browse Source
This commit is contained in:
Nicholas Hastings 2014-09-09 18:20:52 -07:00
parent e0c25cfe08
commit 8a1c6bd833
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/PlayerManager.cpp
View File

@ -422,6 +422,8 @@ void PlayerManager::RunAuthChecks()
unsigned int client = m_AuthQueue[i]; unsigned int client = m_AuthQueue[i];
m_AuthQueue[i] = 0; m_AuthQueue[i] = 0;
removed++; removed++;
const char *steamId = pPlayer->GetSteam2Id();
/* Send to extensions */ /* Send to extensions */
List<IClientListener *>::iterator iter; List<IClientListener *>::iterator iter;
@ -429,7 +431,7 @@ void PlayerManager::RunAuthChecks()
for (iter=m_hooks.begin(); iter!=m_hooks.end(); iter++) for (iter=m_hooks.begin(); iter!=m_hooks.end(); iter++)
{ {
pListener = (*iter); pListener = (*iter);
pListener->OnClientAuthorized(client, authstr); pListener->OnClientAuthorized(client, steamId ? steamId : authstr);
if (!pPlayer->IsConnected()) if (!pPlayer->IsConnected())
{ {
break; break;
@ -439,7 +441,6 @@ void PlayerManager::RunAuthChecks()
/* Send to plugins if player is still connected */ /* Send to plugins if player is still connected */
if (pPlayer->IsConnected() && m_clauth->GetFunctionCount()) if (pPlayer->IsConnected() && m_clauth->GetFunctionCount())
{ {
const char *steamId = pPlayer->GetSteam2Id();
/* :TODO: handle the case of a player disconnecting in the middle */ /* :TODO: handle the case of a player disconnecting in the middle */
m_clauth->PushCell(client); m_clauth->PushCell(client);
/* For legacy reasons, people are expecting the Steam2 id here if using Steam auth */ /* For legacy reasons, people are expecting the Steam2 id here if using Steam auth */
@ -709,17 +710,18 @@ 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);
const char *steamId = pPlayer->GetSteam2Id();
/* Now do authorization */ /* Now do authorization */
for (iter=m_hooks.begin(); iter!=m_hooks.end(); iter++) for (iter=m_hooks.begin(); iter!=m_hooks.end(); iter++)
{ {
pListener = (*iter); pListener = (*iter);
pListener->OnClientAuthorized(client, pPlayer->m_AuthID.c_str()); pListener->OnClientAuthorized(client, steamId ? steamId : pPlayer->m_AuthID.c_str());
} }
/* Finally, tell plugins */ /* Finally, tell plugins */
if (m_clauth->GetFunctionCount()) if (m_clauth->GetFunctionCount())
{ {
const char *steamId = pPlayer->GetSteam2Id();
m_clauth->PushCell(client); m_clauth->PushCell(client);
/* For legacy reasons, people are expecting the Steam2 id here if using Steam auth */ /* For legacy reasons, people are expecting the Steam2 id here if using Steam auth */
m_clauth->PushString(steamId ? steamId : pPlayer->m_AuthID.c_str()); m_clauth->PushString(steamId ? steamId : pPlayer->m_AuthID.c_str());