Merge pull request #330 from fortressforever/fixes/bonusfire-safety

Add null pointer safety to fx_bonusfire
fortressforever · Sep 19, 2016 · 4f2aa4f · 4f2aa4f
2 parents 917fb3c + 8bbb56d
commit 4f2aa4f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/cl_dll/ff/ff_fx_bonusfire.cpp b/cl_dll/ff/ff_fx_bonusfire.cpp
@@ -50,7 +50,11 @@ void BonusFireCallback( const CEffectData &data )
 
 	Vector	projectileOrigin = data.m_vOrigin;
 	float	scale = data.m_flScale;
-	CBaseEntity *pAffectedEntity = ClientEntityList().GetEnt( data.m_hEntity.GetEntryIndex() );
+	CBaseEntity *pAffectedEntity = data.getEntity();
+
+	if ( !pAffectedEntity )
+		return;
+
 	Vector affectedOrigin = pAffectedEntity->GetAbsOrigin();
 	Vector deltaVec = (affectedOrigin - projectileOrigin);
 	VectorNormalize( deltaVec );