fix missing PlayerConnect events

Author: markus-wa

pkg/demoinfocs/datatables.go

@@ -488,72 +488,80 @@ func (p *parser) bindNewPlayerControllerS2(controllerEntity st.Entity) {
 }
 
 func (p *parser) bindNewPlayerPawnS2(pawnEntity st.Entity) {
-	controllerHandle := pawnEntity.PropertyValueMust("m_hController").Handle()
-	if controllerHandle == constants.InvalidEntityHandleSource2 {
-		return
-	}
+	var prevControllerHandle uint64
 
-	controllerEntityID := int(controllerHandle & constants.EntityHandleIndexMaskSource2)
-	controllerEntity := p.gameState.playerControllerEntities[controllerEntityID]
+	pawnEntity.Property("m_hController").OnUpdate(func(controllerHandleVal st.PropertyValue) {
+		controllerHandle := controllerHandleVal.Handle()
+		if controllerHandle == constants.InvalidEntityHandleSource2 || controllerHandle == prevControllerHandle {
+			return
+		}
 
-	pl := p.getOrCreatePlayerFromControllerEntity(controllerEntity)
-	pl.IsConnected = true
+		prevControllerHandle = controllerHandle
 
-	if pl.SteamID64 != 0 {
-		p.eventDispatcher.Dispatch(events.PlayerConnect{Player: pl})
-	} else {
-		p.eventDispatcher.Dispatch(events.BotConnect{Player: pl})
-	}
+		controllerEntityID := int(controllerHandle & constants.EntityHandleIndexMaskSource2)
+		controllerEntity := p.gameState.playerControllerEntities[controllerEntityID]
 
-	// Position
-	pawnEntity.OnPositionUpdate(func(pos r3.Vector) {
-		if pl.IsAlive() {
-			pl.LastAlivePosition = pos
-		}
-	})
+		pl := p.getOrCreatePlayerFromControllerEntity(controllerEntity)
 
-	pawnEntity.Property("m_flFlashDuration").OnUpdate(func(val st.PropertyValue) {
+		if !pl.IsConnected {
+			pl.IsConnected = true
 
-		if val.Float() == 0 {
-			pl.FlashTick = 0
-		} else {
-			pl.FlashTick = p.gameState.ingameTick
+			if pl.SteamID64 != 0 {
+				p.eventDispatcher.Dispatch(events.PlayerConnect{Player: pl})
+			} else {
+				p.eventDispatcher.Dispatch(events.BotConnect{Player: pl})
+			}
 		}
 
-		pl.FlashDuration = val.Float()
+		// Position
+		pawnEntity.OnPositionUpdate(func(pos r3.Vector) {
+			if pl.IsAlive() {
+				pl.LastAlivePosition = pos
+			}
+		})
 
-		if pl.FlashDuration > 0 {
-			if len(p.gameState.flyingFlashbangs) == 0 {
-				return
+		pawnEntity.Property("m_flFlashDuration").OnUpdate(func(val st.PropertyValue) {
+			if val.Float() == 0 {
+				pl.FlashTick = 0
+			} else {
+				pl.FlashTick = p.gameState.ingameTick
 			}
 
-			flashbang := p.gameState.flyingFlashbangs[0]
-			flashbang.flashedEntityIDs = append(flashbang.flashedEntityIDs, pl.EntityID)
-		}
-	})
+			pl.FlashDuration = val.Float()
 
-	p.bindPlayerWeaponsS2(pawnEntity, pl)
+			if pl.FlashDuration > 0 {
+				if len(p.gameState.flyingFlashbangs) == 0 {
+					return
+				}
 
-	pawnEntity.Property("m_pWeaponServices.m_hActiveWeapon").OnUpdate(func(val st.PropertyValue) {
-		pl.IsReloading = false
-	})
+				flashbang := p.gameState.flyingFlashbangs[0]
+				flashbang.flashedEntityIDs = append(flashbang.flashedEntityIDs, pl.EntityID)
+			}
+		})
 
-	pawnEntity.Property("m_bIsDefusing").OnUpdate(func(val st.PropertyValue) {
-		pl.IsDefusing = val.BoolVal()
-	})
+		p.bindPlayerWeaponsS2(pawnEntity, pl)
 
-	spottedByMaskProp := pawnEntity.Property("m_bSpottedByMask.0000")
-	if spottedByMaskProp != nil {
-		spottersChanged := func(val st.PropertyValue) {
-			p.eventDispatcher.Dispatch(events.PlayerSpottersChanged{Spotted: pl})
-		}
+		pawnEntity.Property("m_pWeaponServices.m_hActiveWeapon").OnUpdate(func(val st.PropertyValue) {
+			pl.IsReloading = false
+		})
 
-		spottedByMaskProp.OnUpdate(spottersChanged)
-		pawnEntity.Property("m_bSpottedByMask.0001").OnUpdate(spottersChanged)
-	}
+		pawnEntity.Property("m_bIsDefusing").OnUpdate(func(val st.PropertyValue) {
+			pl.IsDefusing = val.BoolVal()
+		})
 
-	pawnEntity.OnDestroy(func() {
-		pl.IsConnected = false
+		spottedByMaskProp := pawnEntity.Property("m_bSpottedByMask.0000")
+		if spottedByMaskProp != nil {
+			spottersChanged := func(val st.PropertyValue) {
+				p.eventDispatcher.Dispatch(events.PlayerSpottersChanged{Spotted: pl})
+			}
+
+			spottedByMaskProp.OnUpdate(spottersChanged)
+			pawnEntity.Property("m_bSpottedByMask.0001").OnUpdate(spottersChanged)
+		}
+
+		pawnEntity.OnDestroy(func() {
+			pl.IsConnected = false
+		})
 	})
 }