diff -r 06cdeee2a723 -r 8d68569b9648 extensions/sdktools/vhelpers.cpp
--- a/extensions/sdktools/vhelpers.cpp	Thu Jul 09 17:51:12 2009 -0400
+++ b/extensions/sdktools/vhelpers.cpp	Fri Jul 24 12:34:31 2009 +1200
@@ -241,13 +241,8 @@
 		return -1;
 	}
 
-	edict_t *pTarget = gameents->BaseEntityToEdict(tr.m_pEnt);
-	if (pTarget == NULL)
-	{
-		return -1;
-	}
-
-	int ent_index = IndexOfEdict(pTarget);
+	int ent_ref = gamehelpers->EntityToBCompatRef(tr.m_pEnt);
+	int ent_index = gamehelpers->ReferenceToIndex(ent_ref);
 
 	IGamePlayer *pTargetPlayer = playerhelpers->GetGamePlayer(ent_index);
 	if (pTargetPlayer != NULL && !pTargetPlayer->IsInGame())
@@ -259,7 +254,7 @@
 		return -1;
 	}
 
-	return ent_index;
+	return ent_ref;
 }
 
 bool IsEyeAnglesSupported()