1 files changed, 11 insertions, 4 deletions
diff --git a/go/game/state.go b/go/game/state.go
index 73374c6a..abad79a7 100644
--- a/go/game/state.go
+++ b/go/game/state.go
@@ -110,16 +110,23 @@ func NewLocalState() *LocalState {
 	return s
 }
 
-func (s *LocalState) AddNewPlayerDeckAndStore(name string, deck *Deck, store *Store) *Player {
-	p := NewPlayerWithDeckAndStore(len(s.players)+1, name, deck, store, s)
+func (s *LocalState) addPlayer(p *Player) *Player {
+	// Start with the first player
+	if s.activePlayerId == 0 {
+		s.activePlayerId = p.Id
+	}
 	s.players = append(s.players, p)
 	return s.players[len(s.players)-1]
 }
 
+func (s *LocalState) AddNewPlayerDeckAndStore(name string, deck *Deck, store *Store) *Player {
+	p := NewPlayerWithDeckAndStore(len(s.players)+1, name, deck, store, s)
+	return s.addPlayer(p)
+}
+
 func (s *LocalState) AddNewPlayer(name string, deck *Deck) *Player {
 	p := NewPlayer(len(s.players)+1, name, deck, s)
-	s.players = append(s.players, p)
-	return s.players[len(s.players)-1]
+	return s.addPlayer(p)
 }
 
 func (s *LocalState) AddNewAiPlayer(name string) *Player {