Merge pull request #473 from micvbang/micvbang/weapon-owner

markus-wa · web-flow · commit 94ad2daf4740 · 2023-11-16T15:24:28.000Z
datatables cs2: update equipment owner
diff --git a/pkg/demoinfocs/datatables.go b/pkg/demoinfocs/datatables.go
@@ -987,6 +987,7 @@ func (p *parser) bindWeaponS2(entity st.Entity) {
 	entity.Property("m_hOwnerEntity").OnUpdate(func(val st.PropertyValue) {
 		weaponOwner := p.GameState().Participants().FindByPawnHandle(val.Handle())
 		if weaponOwner == nil {
+			equipment.Owner = nil
 			return
 		}
 
@@ -1010,6 +1011,7 @@ func (p *parser) bindWeaponS2(entity st.Entity) {
 		}
 
 		lastMoneyIncreased = false
+		equipment.Owner = nil
 		delete(p.gameState.weapons, entityID)
 	})
 

Original file line number	Diff line number	Diff line change
`@@ -987,6 +987,7 @@ func (p *parser) bindWeaponS2(entity st.Entity) {`
`987`	`987`	`entity.Property("m_hOwnerEntity").OnUpdate(func(val st.PropertyValue) {`
`988`	`988`	`weaponOwner := p.GameState().Participants().FindByPawnHandle(val.Handle())`
`989`	`989`	`if weaponOwner == nil {`
	`990`	`+ equipment.Owner = nil`
`990`	`991`	`return`
`991`	`992`	`}`
`992`	`993`
`@@ -1010,6 +1011,7 @@ func (p *parser) bindWeaponS2(entity st.Entity) {`
`1010`	`1011`	`}`
`1011`	`1012`
`1012`	`1013`	`lastMoneyIncreased = false`
	`1014`	`+ equipment.Owner = nil`
`1013`	`1015`	`delete(p.gameState.weapons, entityID)`
`1014`	`1016`	`})`
`1015`	`1017`