Merge branch 'master' into cache-field-name-check

Author: markus-wa

pkg/demoinfocs/datatables.go

@@ -655,7 +655,7 @@ func (p *parser) bindPlayerWeaponsS2(pawnEntity st.Entity, pl *common.Player) {
 	var cache [maxWeapons]uint64
 	for i := range cache {
 		i2 := i // Copy for passing to handler
-		pawnEntity.Property(playerWeaponPrefixS2 + fmt.Sprintf("%04d", i)).OnUpdate(func(val st.PropertyValue) {
+		updateWeapon := func(val st.PropertyValue) {
 			if val.Any == nil {
 				return
 			}
@@ -691,7 +691,10 @@ func (p *parser) bindPlayerWeaponsS2(pawnEntity st.Entity, pl *common.Player) {
 
 				cache[i2] = 0
 			}
-		})
+		}
+		property := pawnEntity.Property(playerWeaponPrefixS2 + fmt.Sprintf("%04d", i))
+		updateWeapon(property.Value())
+		property.OnUpdate(updateWeapon)
 	}
 }
 

pkg/demoinfocs/s2_commands.go

@@ -298,6 +298,11 @@ func (m *pendingMessage) priority() int {
 
 func (p *parser) handleDemoPacket(pack *msgs2.CDemoPacket) {
 	b := pack.GetData()
+
+	if len(b) == 0 {
+		return
+	}
+
 	r := bitread.NewSmallBitReader(bytes.NewReader(b))
 
 	ms := make([]pendingMessage, 0)

pkg/demoinfocs/sendtables2/class.go

@@ -7,11 +7,17 @@ import (
 	st "github.com/markus-wa/demoinfocs-golang/v4/pkg/demoinfocs/sendtables"
 )
 
+type fpNameTreeCache struct {
+	next map[int]*fpNameTreeCache
+	name string
+}
+
 type class struct {
 	classId         int32
 	name            string
 	serializer      *serializer
 	createdHandlers []st.EntityCreatedHandler
+	fpNameCache     *fpNameTreeCache
 }
 
 func (c *class) ID() int {
@@ -72,7 +78,27 @@ func (c *class) collectFieldsEntries(fields []*field, prefix string) []string {
 }
 
 func (c *class) getNameForFieldPath(fp *fieldPath) string {
-	return strings.Join(c.serializer.getNameForFieldPath(fp, 0), ".")
+	currentCacheNode := c.fpNameCache
+
+	for i := 0; i <= fp.last; i++ {
+		if currentCacheNode.next == nil {
+			currentCacheNode.next = make(map[int]*fpNameTreeCache)
+		}
+
+		pos := fp.path[i]
+		next, exists := currentCacheNode.next[pos]
+		if !exists {
+			next = &fpNameTreeCache{}
+			currentCacheNode.next[pos] = next
+		}
+		currentCacheNode = next
+	}
+
+	if currentCacheNode.name == "" {
+		currentCacheNode.name = strings.Join(c.serializer.getNameForFieldPath(fp, 0), ".")
+	}
+
+	return currentCacheNode.name
 }
 
 func (c *class) getTypeForFieldPath(fp *fieldPath) *fieldType {

pkg/demoinfocs/sendtables2/parser.go

@@ -126,6 +126,9 @@ func (p *Parser) OnDemoClassInfo(m *msgs2.CDemoClassInfo) error {
 			classId:    classId,
 			name:       networkName,
 			serializer: p.serializers[networkName],
+			fpNameCache: &fpNameTreeCache{
+				next: make(map[int]*fpNameTreeCache),
+			},
 		}
 		p.classesById[class.classId] = class
 		p.classesByName[class.name] = class