Merge pull request #328 from fortressforever/fixes/jetpack-disc-crash

Fix client crash when a pyro disconnects while jetpacking
fortressforever · Sep 19, 2016 · 917fb3c · 917fb3c
2 parents 58b71a6 + 983be7c
commit 917fb3c
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/cl_dll/ff/c_ff_player.cpp b/cl_dll/ff/c_ff_player.cpp
@@ -1406,6 +1406,15 @@ C_FFPlayer::~C_FFPlayer()
 	m_PlayerAnimState->Release();
 
 	ReleaseFlashlight();
+
+	// TODO: This would probably be better solved by adding some safety to the jetpack particle effect 
+	// (probably related to the particle effect setting its OwnerEntity as the player), but this fixes 
+	// the crash when a jetpacking player disconnects so it's good enough for now
+	if (!!m_pJetpackEmitter)
+	{
+		m_pJetpackEmitter->SetDieTime( 0.0f );
+		m_pJetpackEmitter = NULL;
+	}
 }
 
 C_FFPlayer* C_FFPlayer::GetLocalFFPlayer()