fix crash if other_death entity doesn't exist

markus-wa · Oct 18, 2023 · 7be9c51 · 7be9c51
1 parent 665d2c6
commit 7be9c51
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/pkg/demoinfocs/game_events.go b/pkg/demoinfocs/game_events.go
@@ -843,7 +843,14 @@ func (geh gameEventHandler) otherDeath(data map[string]*msg.CSVCMsg_GameEventKey
 	killer := geh.playerByUserID32(data["attacker"].GetValShort())
 	otherType := data["othertype"].GetValString()
 	otherID := data["otherid"].GetValShort()
-	otherPosition := geh.gameState().entities[int(otherID)].Position()
+	other := geh.gameState().entities[int(otherID)]
+
+	var otherPosition r3.Vector
+
+	if other != nil {
+		otherPosition = other.Position()
+	}
+
 	wepType := common.MapEquipment(data["weapon"].GetValString())
 	weapon := getPlayerWeapon(killer, wepType)