refactor GameState.playersByUserID population

Author: markus-wa

datatables.go

@@ -179,26 +179,42 @@ func (p *Parser) bindPlayers() {
 }
 
 func (p *Parser) bindNewPlayer(playerEntity *st.Entity) {
-	var pl *common.Player
-	playerIndex := playerEntity.ID()
-	if p.gameState.playersByEntityID[playerIndex] != nil {
-		pl = p.gameState.playersByEntityID[playerIndex]
-	} else {
-		pl = common.NewPlayer()
-		p.gameState.playersByEntityID[playerIndex] = pl
-		pl.SteamID = -1
-		pl.Name = "unconnected"
+	entityID := playerEntity.ID()
+	rp := p.rawPlayers[entityID-1]
+
+	isNew := false
+	pl := p.gameState.playersByEntityID[entityID]
+	if pl == nil {
+		pl = p.gameState.playersByUserID[rp.userID]
+
+		if pl == nil {
+			isNew = true
+
+			pl = common.NewPlayer()
+			pl.Name = rp.name
+			pl.SteamID = rp.xuid
+			pl.IsBot = rp.isFakePlayer
+			pl.UserID = rp.userID
+		}
 	}
+	p.gameState.playersByEntityID[entityID] = pl
+	p.gameState.playersByUserID[rp.userID] = pl
 
-	pl.EntityID = playerEntity.ID()
+	pl.EntityID = entityID
 	pl.Entity = playerEntity
+	pl.AdditionalPlayerInformation = &p.additionalPlayerInfo[entityID]
 
 	playerEntity.OnDestroy(func() {
-		delete(p.gameState.playersByEntityID, pl.EntityID)
+		delete(p.gameState.playersByEntityID, entityID)
 	})
 
 	// Position
-	playerEntity.BindPosition(&pl.Position)
+	playerEntity.OnPositionUpdate(func(pos r3.Vector) {
+		pl.Position = pos
+		if pl.IsAlive() {
+			pl.LastAlivePosition = pos
+		}
+	})
 
 	// General info
 	playerEntity.FindProperty("m_iTeamNum").OnUpdate(func(val st.PropertyValue) {
@@ -279,6 +295,10 @@ func (p *Parser) bindNewPlayer(playerEntity *st.Entity) {
 		}
 		pl.IsDefusing = val.IntVal != 0
 	})
+
+	if isNew && pl.SteamID != 0 {
+		p.eventDispatcher.Dispatch(events.PlayerConnect{Player: pl})
+	}
 }
 
 func (p *Parser) bindWeapons() {

parsing.go

@@ -245,31 +245,6 @@ type frameParsedTokenType struct{}
 var frameParsedToken = new(frameParsedTokenType)
 
 func (p *Parser) handleFrameParsed(*frameParsedTokenType) {
-	for k, rp := range p.rawPlayers {
-		// We need to re-map the players from their entityID to their UID.
-		// This is necessary because we don't always have the UID when the player connects (or something like that, not really sure tbh).
-		// k+1 for index -> ID
-		if pl := p.gameState.playersByEntityID[k+1]; pl != nil {
-			pl.Name = rp.name
-			pl.SteamID = rp.xuid
-			pl.IsBot = rp.isFakePlayer
-			pl.AdditionalPlayerInformation = &p.additionalPlayerInfo[pl.EntityID]
-
-			if pl.IsAlive() {
-				pl.LastAlivePosition = pl.Position
-			}
-
-			if p.gameState.playersByUserID[rp.userID] == nil {
-				p.gameState.playersByUserID[rp.userID] = pl
-				pl.UserID = rp.userID
-
-				if pl.SteamID != 0 {
-					p.eventDispatcher.Dispatch(events.PlayerConnect{Player: pl})
-				}
-			}
-		}
-	}
-
 	// PlayerFlashed events need to be dispatched at the end of the tick
 	// because Player.FlashDuration is updated after the game-events are parsed.
 	for _, e := range p.currentFlashEvents {