Fix hornets crashing the game if they hit you after a level transition

Resolves ValveSoftware/halflife#1598
twhl-community · Feb 21, 2022 · e7fb734 · e7fb734
1 parent f347954
commit e7fb734
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/dlls/hornet.cpp b/dlls/hornet.cpp
@@ -409,7 +409,9 @@ void CHornet::DartTouch(CBaseEntity* pOther)
 
 void CHornet::DieTouch(CBaseEntity* pOther)
 {
-	if (pOther && 0 != pOther->pev->takedamage)
+	//Only deal damage if the owner exists in this map.
+	//Hornets that transition without their owner (e.g. Alien Grunt) will otherwise pass a null pointer down to TakeDamage.
+	if (pOther && 0 != pOther->pev->takedamage && nullptr != pev->owner)
 	{ // do the damage
 
 		switch (RANDOM_LONG(0, 2))