fix dereferencing nullptr in ghost_capture event (#1883)

* init

* checked in playerbyindex already

* do the same for the vip, check each cap exists before turning it off

* fxies to vip and jug nullptr dereference

* we do not have a player_ghost_capture event

Author: AdamTadeusz

src/game/client/neo/ui/neo_hud_deathnotice.cpp

@@ -908,19 +908,20 @@ void CNEOHud_DeathNotice::AddPlayerRankChange(IGameEvent* event)
 
 void CNEOHud_DeathNotice::AddPlayerGhostCapture(IGameEvent* event)
 {
-	// the event should be "player_ghost_capture"
-	const int playerCapturedGhost = engine->GetPlayerForUserID(event->GetInt("userid"));
+	// the event should be "ghost_capture"
+	const int playerCapturedGhostUserID = event->GetInt("userid");
+	const int playerCapturedGhostIndex = playerCapturedGhostUserID != INVALID_USER_ID ? engine->GetPlayerForUserID(playerCapturedGhostUserID) : 0;
 
 	// Get the name of the player
-	C_NEO_Player* pPlayer = ToNEOPlayer(UTIL_PlayerByIndex(playerCapturedGhost));
-	const char* playerCapturedGhostName = pPlayer ? pPlayer->GetPlayerNameWithTakeoverContext(playerCapturedGhost) : "";
+	C_NEO_Player* pPlayer = ToNEOPlayer(UTIL_PlayerByIndex(playerCapturedGhostIndex));
+	const char* playerCapturedGhostName = pPlayer ? pPlayer->GetPlayerNameWithTakeoverContext(playerCapturedGhostIndex) : "";
 
 	// Make a new death notice
 	DeathNoticeItem deathMsg;
-	deathMsg.Killer.iEntIndex = playerCapturedGhost;
+	deathMsg.Killer.iEntIndex = playerCapturedGhostIndex;
 	g_pVGuiLocalize->ConvertANSIToUnicode(playerCapturedGhostName, deathMsg.Killer.szName, sizeof(deathMsg.Killer.szName));
 	deathMsg.Killer.iNameLength = V_wcslen(deathMsg.Killer.szName);
-	if (const auto playerCapturedGhostTeam = GetPlayersTeam(playerCapturedGhost))
+	if (const auto playerCapturedGhostTeam = GetPlayersTeam(playerCapturedGhostIndex))
 	{
 		deathMsg.Killer.iTeam = playerCapturedGhostTeam->GetTeamNumber();
 	}
@@ -937,18 +938,19 @@ void CNEOHud_DeathNotice::AddPlayerGhostCapture(IGameEvent* event)
 void CNEOHud_DeathNotice::AddVIPExtract(IGameEvent* event)
 {
 	// the event should be "vip_extract"
-	const int playerExtracted = engine->GetPlayerForUserID(event->GetInt("userid"));
+	const int playerExtractedUserID = event->GetInt("userid");
+	const int playerExtractedIndex = playerExtractedUserID != INVALID_USER_ID ? engine->GetPlayerForUserID(playerExtractedUserID) : 0;
 
 	// Name of VIP
-	C_NEO_Player* pPlayer = ToNEOPlayer(UTIL_PlayerByIndex(playerExtracted));
-	const char* playerExtractedName = pPlayer ? pPlayer->GetPlayerNameWithTakeoverContext(playerExtracted) : "";
+	C_NEO_Player* pPlayer = ToNEOPlayer(UTIL_PlayerByIndex(playerExtractedIndex));
+	const char* playerExtractedName = pPlayer ? pPlayer->GetPlayerNameWithTakeoverContext(playerExtractedIndex) : "";
 
 	// Make a new death notice
 	DeathNoticeItem deathMsg;
-	deathMsg.Killer.iEntIndex = playerExtracted;
+	deathMsg.Killer.iEntIndex = playerExtractedIndex;
 	g_pVGuiLocalize->ConvertANSIToUnicode(playerExtractedName, deathMsg.Killer.szName, sizeof(deathMsg.Killer.szName));
 	deathMsg.Killer.iNameLength = V_wcslen(deathMsg.Killer.szName);
-	if (const auto playerExtractedTeam = GetPlayersTeam(playerExtracted))
+	if (const auto playerExtractedTeam = GetPlayersTeam(playerExtractedIndex))
 	{
 		deathMsg.Killer.iTeam = playerExtractedTeam->GetTeamNumber();
 	}

src/game/shared/neo/neo_gamerules.cpp

@@ -1431,13 +1431,19 @@ void CNEORules::Think(void)
 				for (int i = 0; i < m_pGhostCaps.Count(); i++)
 				{
 					auto pGhostCap = dynamic_cast<CNEOGhostCapturePoint*>(UTIL_EntityByIndex(m_pGhostCaps[i]));
+					if (!pGhostCap)
+					{
+						Assert(false);
+						continue;
+					}	
 					pGhostCap->SetActive(false);
 				}
 
 				IGameEvent* event = gameeventmanager->CreateEvent("ghost_capture");
 				if (event)
 				{
-					event->SetInt("userid", UTIL_PlayerByIndex(m_iGhosterPlayer)->GetUserID());
+					CBasePlayer* pCaptorClient = UTIL_PlayerByIndex(captorClient);
+					event->SetInt("userid", pCaptorClient ? pCaptorClient->GetUserID() : INVALID_USER_ID);
 					gameeventmanager->FireEvent(event);
 				}
 
@@ -1505,8 +1511,7 @@ void CNEORules::Think(void)
 				gameeventmanager->FireEvent(event);
 			}
 		}
-
-		if (!m_pVIP->IsAlive())
+		else if (!m_pVIP->IsAlive())
 		{
 			if (sv_neo_vip_ctg_on_death.GetBool())
 			{
@@ -1544,6 +1549,11 @@ void CNEORules::Think(void)
 				for (int i = 0; i < m_pGhostCaps.Count(); i++)
 				{
 					auto pGhostCap = dynamic_cast<CNEOGhostCapturePoint*>(UTIL_EntityByIndex(m_pGhostCaps[i]));
+					if (!pGhostCap)
+					{
+						Assert(false);
+						continue;
+					}
 					pGhostCap->SetActive(false);
 				}
 
@@ -1553,7 +1563,8 @@ void CNEORules::Think(void)
 				IGameEvent* event = gameeventmanager->CreateEvent("vip_extract");
 				if (event)
 				{
-					event->SetInt("userid", m_pVIP->GetUserID());
+					CBasePlayer* pCaptorClient = UTIL_PlayerByIndex(captorClient);
+					event->SetInt("userid", pCaptorClient ? pCaptorClient->GetUserID() : INVALID_USER_ID);
 					gameeventmanager->FireEvent(event);
 				}
 
@@ -4243,9 +4254,15 @@ void CNEORules::ClientDisconnected(edict_t* pClient)
 
 		if (pNeoPlayer->GetClass() == NEO_CLASS_JUGGERNAUT && pNeoPlayer->IsAlive())
 		{
+			m_pJuggernautPlayer = nullptr;
 			pNeoPlayer->SpawnJuggernautPostDeath();
 		}
 
+		if (pNeoPlayer->GetClass() == NEO_CLASS_VIP)
+		{ // can't check if m_pVIP is this player, assume only one vip per round. NEO TODO (Adam) Use CHandles or entity indexes for m_pVIP, m_pJuggernautPlayer
+			m_pVIP = nullptr;
+		}
+
 		// Save XP/death counts
 		if (sv_neo_player_restore.GetBool())
 		{