Skip to content

Fix ZR crash when the victim controller is gone #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2024
Merged

Fix ZR crash when the victim controller is gone #215

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/zombiereborn.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,6 +793,10 @@ float ZR_MoanTimer(CHandle<CCSPlayerPawn> hPawn)

void ZR_Infect(CCSPlayerController *pAttackerController, CCSPlayerController *pVictimController, bool bDontBroadcast)
{
// This can be null if the victim disconnected right before getting hit AND someone joined in their place immediately, thus replacing the controller
if (!pVictimController)
return;

if (pVictimController->m_iTeamNum() == CS_TEAM_CT)
pVictimController->SwitchTeam(CS_TEAM_T);

Expand Down Expand Up @@ -1019,7 +1023,7 @@ bool ZR_Detour_TakeDamageOld(CCSPlayerPawn *pVictimPawn, CTakeDamageInfo *pInfo)
}

if (g_iGroanChance && pVictimPawn->m_iTeamNum() == CS_TEAM_T && (rand() % g_iGroanChance) == 1)
pVictimController->GetPawn()->EmitSound("zr.amb.zombie_pain");
pVictimPawn->EmitSound("zr.amb.zombie_pain");

// grenade and molotov knockback
if (pAttackerPawn->m_iTeamNum() == CS_TEAM_CT && pVictimPawn->m_iTeamNum() == CS_TEAM_T)
Expand Down