YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-03-13 05:51:19 +00:00
Code Issues Projects Releases Wiki Activity

EHANDLE: return any player if stored player and it is NULL

Browse Source
This commit is contained in:
mittorn 2019-02-23 15:54:35 +00:00
parent 9d27e6f3ea
commit c4ccfc4dfc
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/cbase.cpp
View File

@ -479,6 +479,30 @@ edict_t *EHANDLE::Get( void )
{
if( m_pent )
{
// try always return non-null when saved entity is player
if( ENTINDEX( m_pent ) > 0 && ENTINDEX( m_pent ) <= gpGlobals->maxClients )
{
int i;
// check if player entity exists
if( m_pent->pvPrivateData )
{
CBaseEntity *pPlayer = CBaseEntity::Instance( m_pent );
if( pPlayer && pPlayer->IsPlayer() )
return pPlayer->edict();
}
// if not, find any player
for( i = 1; i <= gpGlobals->maxClients; i++ )
{
CBaseEntity *pPlayer = UTIL_PlayerByIndex(i);
if( pPlayer && pPlayer->IsPlayer() )
return pPlayer->edict();
}
// no players found, return as is
return m_pent;
}
if( m_pent->serialnumber == m_serialnumber )
return m_pent;
else