From d1fbe5c07af3cfe940148434d00637efd03d1d6f Mon Sep 17 00:00:00 2001 From: Kieran Kihn <114803508+kierankihn@users.noreply.github.com> Date: Mon, 17 Nov 2025 12:34:32 +0800 Subject: [PATCH] fix(game): preserve `currentPlayer` index when adding a new player --- src/game/GameState.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/game/GameState.h b/src/game/GameState.h index 0e967dc..c9ade2a 100644 --- a/src/game/GameState.h +++ b/src/game/GameState.h @@ -195,7 +195,9 @@ namespace UNO::GAME { template void GameState::addPlayer(PlayerStateType playerState) { - this->currentPlayer_ = this->players_.push_back(std::move(playerState), this->currentPlayer_); + int currentPlayerIndex = this->currentPlayer_ - this->players_.begin(); + this->players_.push_back(std::move(playerState)); + this->currentPlayer_ = this->players_.begin() + currentPlayerIndex; } template