1.1 --- a/core/PlayerManager.cpp	Fri Jun 08 07:54:45 2007 +0000
     1.2 +++ b/core/PlayerManager.cpp	Fri Jun 08 16:14:22 2007 +0000
     1.3 @@ -156,10 +156,13 @@
     1.4  			removed++;
     1.5  
     1.6  			/* Do admin lookups */
     1.7 -			AdminId id = g_Admins.FindAdminByIdentity("steam", authstr);
     1.8 -			if (id != INVALID_ADMIN_ID)
     1.9 +			if (pPlayer->GetAdminId() == INVALID_ADMIN_ID)
    1.10  			{
    1.11 -				CheckSetAdmin(client, pPlayer, id);
    1.12 +				AdminId id = g_Admins.FindAdminByIdentity("steam", authstr);
    1.13 +				if (id != INVALID_ADMIN_ID)
    1.14 +				{
    1.15 +					CheckSetAdmin(client, pPlayer, id);
    1.16 +				}
    1.17  			}
    1.18  
    1.19  			/* Send to extensions */
    1.20 @@ -285,7 +288,7 @@
    1.21  			*ptr = '\0';
    1.22  		}
    1.23  		
    1.24 -		AdminId id = g_Admins.FindAdminByIdentity("ip", pPlayer->GetIPAddress());
    1.25 +		AdminId id = g_Admins.FindAdminByIdentity("ip", ip);
    1.26  		if (id != INVALID_ADMIN_ID)
    1.27  		{
    1.28  			CheckSetAdmin(client, pPlayer, id);