fix: possible invalid pawn entity

markus-wa · Dec 30, 2023 · 5245396 · 5245396
1 parent a96cc7b
commit 5245396
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/pkg/demoinfocs/common/player.go b/pkg/demoinfocs/common/player.go
@@ -37,6 +37,15 @@ type Player struct {
 }
 
 func (p *Player) PlayerPawnEntity() st.Entity {
+	pawn, exists := p.Entity.PropertyValue("m_hPawn")
+	if !exists {
+		return nil
+	}
+
+	if pawn.Handle() == constants.InvalidEntityHandleSource2 {
+		return nil
+	}
+
 	playerPawn, exists := p.Entity.PropertyValue("m_hPlayerPawn")
 	if !exists {
 		return nil

diff --git a/pkg/demoinfocs/common/player_test.go b/pkg/demoinfocs/common/player_test.go
@@ -431,6 +431,7 @@ func TestPlayer_Velocity(t *testing.T) {
 func createPlayerForVelocityTest() *Player {
 	controllerEntity := entityWithProperties([]fakeProp{
 		{propName: "m_hPlayerPawn", value: st.PropertyValue{Any: uint64(1), S2: true}},
+		{propName: "m_hPawn", value: st.PropertyValue{Any: uint64(1), S2: true}},
 	})
 	pawnEntity := new(stfake.Entity)
 	position := r3.Vector{X: 20, Y: 300, Z: 100}