Merge branch 'FreeSlave-fix-game_score-crash'

CHANGELOG.md

@@ -8,7 +8,8 @@
 
 * Added missing client side event for `func_vehicle` sounds
 * Link Linux binaries with `-Wl` and `--no-undefined` flags to avoid situations where something was referenced but wasn't added in the build (Thanks a1batross)
-* Prevent game_zone_player from transitioning across levels to fix Mod_NimForName: not found issue [#241](https://github.com/twhl-community/halflife-updated/pull/241) (Thanks FreeSlave)
+* Prevented game_zone_player from transitioning across levels to fix Mod_NumForName: not found issue [#241](https://github.com/twhl-community/halflife-updated/pull/241) (Thanks FreeSlave)
+* Fixed null dereference in game_score [#246](https://github.com/twhl-community/halflife-updated/pull/246) (Thanks FreeSlave)
 
 ### Features
 

FULL_UPDATED_CHANGELOG.md

@@ -294,7 +294,8 @@ Fixes for bugs introduced in beta builds are not included in this list.
 * Added cvar `sv_allowbunnyhopping` to control whether the bunny hopping limiter is enabled (halflife issue [#11](https://github.com/ValveSoftware/halflife/issues/11))
 * Added `sv_load_all_maps` & `sv_stop_loading_all_maps` to help automate node graph generation
 * Added missing client side event for `func_vehicle` sounds
-* Prevent game_zone_player from transitioning across levels to fix Mod_NimForName: not found issue [#241](https://github.com/twhl-community/halflife-updated/pull/241) (Thanks FreeSlave)
+* Prevented game_zone_player from transitioning across levels to fix Mod_NumForName: not found issue [#241](https://github.com/twhl-community/halflife-updated/pull/241) (Thanks FreeSlave)
+* Fixed null dereference in game_score [#246](https://github.com/twhl-community/halflife-updated/pull/246) (Thanks FreeSlave)
 
 ## Code cleanup
 

dlls/maprules.cpp

@@ -173,7 +173,7 @@ void CGameScore::Use(CBaseEntity* pActivator, CBaseEntity* pCaller, USE_TYPE use
 		return;
 
 	// Only players can use this
-	if (pActivator->IsPlayer())
+	if (pActivator && pActivator->IsPlayer())
 	{
 		if (AwardToTeam())
 		{