From 761cbf9a8ae378c0b96550d9163d556343b2eb2f Mon Sep 17 00:00:00 2001 From: peace-maker Date: Sat, 11 Mar 2017 09:54:38 -0700 Subject: [PATCH] Fix crash when accessing gamerules during mapchange (#593) If the gamerules proxy entity doesn't exist, don't try to generate the reference for it. --- extensions/sdktools/gamerulesnatives.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/sdktools/gamerulesnatives.cpp b/extensions/sdktools/gamerulesnatives.cpp index 9fac96f66..195a2a7b9 100644 --- a/extensions/sdktools/gamerulesnatives.cpp +++ b/extensions/sdktools/gamerulesnatives.cpp @@ -70,7 +70,8 @@ static CBaseEntity* GetGameRulesProxyEnt() if (proxyEntRef == -1 || (pProxy = gamehelpers->ReferenceToEntity(proxyEntRef)) == NULL) { pProxy = FindEntityByNetClass(playerhelpers->GetMaxClients(), g_szGameRulesProxy); - proxyEntRef = gamehelpers->EntityToReference(pProxy); + if (pProxy) + proxyEntRef = gamehelpers->EntityToReference(pProxy); } return pProxy;