fix: possible invalid pawn entity

markus-wa · Dec 29, 2023 · 9235227 · 9235227
1 parent b8323a8
commit 9235227
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/pkg/demoinfocs/common/player.go b/pkg/demoinfocs/common/player.go
@@ -37,12 +37,17 @@ type Player struct {
 }
 
 func (p *Player) PlayerPawnEntity() st.Entity {
-	playerPawn, exists := p.Entity.PropertyValue("m_hPlayerPawn")
+	playerPawn, exists := p.Entity.PropertyValue("m_hPawn")
 	if !exists {
 		return nil
 	}
 
-	return p.demoInfoProvider.FindEntityByHandle(playerPawn.Handle())
+	handle := playerPawn.Handle()
+	if handle == constants.InvalidEntityHandleSource2 {
+		return nil
+	}
+
+	return p.demoInfoProvider.FindEntityByHandle(handle)
 }
 
 func (p *Player) GetTeam() Team {