Merge branch 'master' into add-otherdeath-event

Falderebet · web-flow · commit 372ffb1651cf · 2023-10-13T13:31:04.000+02:00
diff --git a/pkg/demoinfocs/common/player.go b/pkg/demoinfocs/common/player.go
@@ -363,7 +363,7 @@ func (p *Player) Health() int {
 // Armor returns the player's armor points, normally 0-100.
 func (p *Player) Armor() int {
 	if p.demoInfoProvider.IsSource2() {
-		return getInt(p.Entity, "m_iPawnArmor")
+		return getInt(p.PlayerPawnEntity(), "m_ArmorValue")
 	}
 
 	return getInt(p.Entity, "m_ArmorValue")

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ func (p *Player) Health() int {`
`363`	`363`	`// Armor returns the player's armor points, normally 0-100.`
`364`	`364`	`func (p *Player) Armor() int {`
`365`	`365`	`if p.demoInfoProvider.IsSource2() {`
`366`		`- return getInt(p.Entity, "m_iPawnArmor")`
	`366`	`+ return getInt(p.PlayerPawnEntity(), "m_ArmorValue")`
`367`	`367`	`}`
`368`	`368`
`369`	`369`	`return getInt(p.Entity, "m_ArmorValue")`