From cf39d4b820a596dc3dbddcde2a555e275268b437 Mon Sep 17 00:00:00 2001
From: 42 <33488710+FortyTwoFortyTwo@users.noreply.github.com>
Date: Fri, 8 Jul 2022 15:33:43 +0100
Subject: [PATCH] Fix support for SDKCall returning non-networked entity
 (#1797)

(cherry picked from commit 625c7a98f29a63a644973dd432caab3b237a34da)
---
 extensions/sdktools/vcaller.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/extensions/sdktools/vcaller.cpp b/extensions/sdktools/vcaller.cpp
index a6447463..d926cd79 100644
--- a/extensions/sdktools/vcaller.cpp
+++ b/extensions/sdktools/vcaller.cpp
@@ -509,16 +509,7 @@ static cell_t SDKCall(IPluginContext *pContext, const cell_t *params)
 					|| vc->retinfo->vtype == Valve_CBasePlayer)
 		{
 			CBaseEntity *pEntity = *(CBaseEntity **)(vc->retbuf);
-			if (!pEntity)
-			{
-				return -1;
-			}
-			edict_t *pEdict = gameents->BaseEntityToEdict(pEntity);
-			if (!pEdict || pEdict->IsFree())
-			{
-				return -1;
-			}
-			return IndexOfEdict(pEdict);
+			return gamehelpers->EntityToBCompatRef(pEntity);
 		} else if (vc->retinfo->vtype == Valve_Edict) {
 			edict_t *pEdict = *(edict_t **)(vc->retbuf);
 			if (!pEdict || pEdict->IsFree())