use player_connect event to set raw player in s2

markus-wa · May 16, 2024 · 20d12ff · 20d12ff
1 parent 83e98ac
commit 20d12ff
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/pkg/demoinfocs/game_events.go b/pkg/demoinfocs/game_events.go
@@ -641,10 +641,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 +658,14 @@ 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
+	} else {
+		playerIndex = int(data["index"].GetValByte())
+	}
+
+	geh.parser.setRawPlayer(playerIndex, pl)
 }
 
 func (geh gameEventHandler) playerDisconnect(data map[string]*msg.CSVCMsg_GameEventKeyT) {