diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c8b8a13..574cdf0e 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/FULL_UPDATED_CHANGELOG.md b/FULL_UPDATED_CHANGELOG.md index 5d88fc80..580cb23a 100644 --- a/FULL_UPDATED_CHANGELOG.md +++ b/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 diff --git a/dlls/maprules.cpp b/dlls/maprules.cpp index 71800302..76d2924b 100644 --- a/dlls/maprules.cpp +++ b/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()) {