Merge pull request #537 from BestAwperEver/playerConnect-set-raw-player

workaround for `userid` in `player_connect`

Author: akiver

pkg/demoinfocs/game_events.go

@@ -2,6 +2,7 @@ package demoinfocs
 
 import (
 	"fmt"
+	"math"
 
 	"github.com/golang/geo/r3"
 	"github.com/markus-wa/go-unassert"
@@ -641,10 +642,6 @@ func (geh gameEventHandler) HostageRescuedAll(map[string]*msg.CSVCMsg_GameEventK
 }
 
 func (geh gameEventHandler) playerConnect(data map[string]*msg.CSVCMsg_GameEventKeyT) {
-	if geh.parser.isSource2() {
-		return
-	}
-
 	pl := common.PlayerInfo{
 		UserID:       int(data["userid"].GetValShort()),
 		Name:         data["name"].GetValString(),
@@ -662,7 +659,17 @@ func (geh gameEventHandler) playerConnect(data map[string]*msg.CSVCMsg_GameEvent
 		}
 	}
 
-	geh.parser.setRawPlayer(int(data["index"].GetValByte()), pl)
+	var playerIndex int
+	if geh.parser.isSource2() {
+		playerIndex = pl.UserID
+		if !pl.IsFakePlayer && !pl.IsHltv && pl.XUID > 0 && pl.UserID <= math.MaxUint8 {
+			pl.UserID |= math.MaxUint8 << 8
+		}
+	} else {
+		playerIndex = int(data["index"].GetValByte())
+	}
+
+	geh.parser.setRawPlayer(playerIndex, pl)
 }
 
 func (geh gameEventHandler) playerDisconnect(data map[string]*msg.CSVCMsg_GameEventKeyT) {