feat: check for m_lifeState value in player.IsAlive

Author: akiver

pkg/demoinfocs/common/common_test.go

@@ -166,6 +166,11 @@ func TestConvertSteamID64To32(t *testing.T) {
 	assert.Equal(t, uint32(52686539), id)
 }
 
+type fakeProp struct {
+	propName string
+	value    st.PropertyValue
+}
+
 type demoInfoProviderMock struct {
 	tickRate             float64
 	ingameTick           int
@@ -221,6 +226,21 @@ func entityWithProperty(propName string, value st.PropertyValue) *stfake.Entity
 	return entity
 }
 
+func entityWithProperties(properties []fakeProp) *stfake.Entity {
+	entity := entityWithID(1)
+
+	for _, prop := range properties {
+		property := new(stfake.Property)
+		property.On("Value").Return(prop.value)
+
+		entity.On("Property", prop.propName).Return(property)
+		entity.On("PropertyValue", prop.propName).Return(prop.value, true)
+		entity.On("PropertyValueMust", prop.propName).Return(prop.value)
+	}
+
+	return entity
+}
+
 func entityWithoutProperty(propName string) *stfake.Entity {
 	entity := entityWithID(1)
 

pkg/demoinfocs/common/player.go

@@ -51,9 +51,9 @@ func (p *Player) SteamID32() uint32 {
 	return ConvertSteamID64To32(p.SteamID64)
 }
 
-// IsAlive returns true if the Hp of the player are > 0.
+// IsAlive returns true if the player is alive.
 func (p *Player) IsAlive() bool {
-	return p.Health() > 0
+	return p.Health() > 0 || getInt(p.Entity, "m_lifeState") == 0
 }
 
 // IsBlinded returns true if the player is currently flashed.
@@ -298,7 +298,7 @@ func (p *Player) Position() r3.Vector {
 
 // PositionEyes returns the player's position with the Z value at eye height.
 // This is what you get from cl_showpos 1.
-// See lso Position().
+// See also Position().
 func (p *Player) PositionEyes() r3.Vector {
 	if p.Entity == nil {
 		return r3.Vector{}

pkg/demoinfocs/common/player_test.go

@@ -42,16 +42,28 @@ func TestPlayerWeapons(t *testing.T) {
 func TestPlayerAlive(t *testing.T) {
 	pl := newPlayer(0)
 
-	pl.Entity = entityWithProperty("m_iHealth", st.PropertyValue{IntVal: 100})
+	pl.Entity = entityWithProperties([]fakeProp{
+		{propName: "m_iHealth", value: st.PropertyValue{IntVal: 100}},
+		{propName: "m_lifeState", value: st.PropertyValue{IntVal: 0}},
+	})
 	assert.Equal(t, true, pl.IsAlive(), "Should be alive")
 
-	pl.Entity = entityWithProperty("m_iHealth", st.PropertyValue{IntVal: 1})
+	pl.Entity = entityWithProperties([]fakeProp{
+		{propName: "m_iHealth", value: st.PropertyValue{IntVal: 1}},
+		{propName: "m_lifeState", value: st.PropertyValue{IntVal: 0}},
+	})
 	assert.Equal(t, true, pl.IsAlive(), "Should be alive")
 
-	pl.Entity = entityWithProperty("m_iHealth", st.PropertyValue{IntVal: 0})
+	pl.Entity = entityWithProperties([]fakeProp{
+		{propName: "m_iHealth", value: st.PropertyValue{IntVal: 0}},
+		{propName: "m_lifeState", value: st.PropertyValue{IntVal: 2}},
+	})
 	assert.Equal(t, false, pl.IsAlive(), "Should be dead")
 
-	pl.Entity = entityWithProperty("m_iHealth", st.PropertyValue{IntVal: -10})
+	pl.Entity = entityWithProperties([]fakeProp{
+		{propName: "m_iHealth", value: st.PropertyValue{IntVal: -10}},
+		{propName: "m_lifeState", value: st.PropertyValue{IntVal: 2}},
+	})
 	assert.Equal(t, false, pl.IsAlive(), "Should be dead")
 }