1.1 --- a/core/PlayerManager.cpp	Thu Jul 07 19:53:56 2011 -0400
     1.2 +++ b/core/PlayerManager.cpp	Thu Jul 07 21:31:07 2011 -0400
     1.3 @@ -274,7 +274,7 @@
     1.4  	SM_ExecuteAllConfigs();
     1.5  }
     1.6  
     1.7 -bool PlayerManager::IsServerActivated()
     1.8 +bool PlayerManager::IsServerActivated() const
     1.9  {
    1.10  	return m_FirstPass;
    1.11  }
    1.12 @@ -856,7 +856,7 @@
    1.13  
    1.14  CPlayer *PlayerManager::GetPlayerByIndex(int client) const
    1.15  {
    1.16 -	if (client > gpGlobals->maxClients || client < 1)
    1.17 +	if (!IsServerActivated() || client > gpGlobals->maxClients || client < 1)
    1.18  	{
    1.19  		return NULL;
    1.20  	}
    1.21 @@ -937,6 +937,12 @@
    1.22  
    1.23  void PlayerManager::ClearAdminId(AdminId id)
    1.24  {
    1.25 +	// Players may not be inited if server hasn't yet been activated
    1.26 +	if (!IsServerActivated())
    1.27 +	{
    1.28 +		return;
    1.29 +	}
    1.30 +
    1.31  	int maxClients = gpGlobals->maxClients;
    1.32  	for (int i=1; i<=maxClients; i++)
    1.33  	{
    1.34 @@ -949,8 +955,8 @@
    1.35  
    1.36  void PlayerManager::ClearAllAdmins()
    1.37  {
    1.38 -	// Players may not be inited if server hadn't been activated
    1.39 -	if (!m_Players)
    1.40 +	// Players may not be inited if server hasn't yet been activated
    1.41 +	if (!IsServerActivated())
    1.42  	{
    1.43  		return;
    1.44  	}
    1.45 @@ -969,8 +975,8 @@
    1.46  
    1.47  void PlayerManager::RecheckAnyAdmins()
    1.48  {
    1.49 -	// Players may not be inited if server hadn't been activated
    1.50 -	if (!m_Players)
    1.51 +	// Players may not be inited if server hasn't yet been activated
    1.52 +	if (!IsServerActivated())
    1.53  	{
    1.54  		return;
    1.55  	}