Keep robot substitution request flag active

This allows the remote-control to unset it, indicating the GCO that the team is ready.

Author: g3force

internal/app/rcon/server_remotecontrol.go

@@ -271,7 +271,8 @@ func (c *RemoteControlClient) checkStopTimeout() error {
 
 func (c *RemoteControlClient) checkRequestRobotSubstitution() error {
 	gameStateType := *c.gcEngine.CurrentState().GameState.Type
-	if gameStateType == state.GameState_HALT {
+	teamState := c.gcEngine.CurrentState().TeamState[c.team.String()]
+	if gameStateType == state.GameState_HALT && teamState.RequestsBotSubstitutionSince == nil {
 		return errors.New("Game is halted")
 	}
 	return nil

internal/app/statemachine/change_command.go

@@ -27,6 +27,10 @@ func (s *StateMachine) processChangeNewCommand(newState *state.State, newCommand
 	if *newState.GameState.Type == state.GameState_STOP {
 		if prevGameState.IsHalted() {
 			newState.ReadyContinueTime = timestamppb.New(s.timeProvider().Add(s.gameConfig.PreparationTimeAfterHalt))
+			// reset robot substitution flags
+			for _, team := range state.BothTeams() {
+				newState.TeamInfo(team).RequestsBotSubstitutionSince = nil
+			}
 		} else if newState.ReadyContinueTime == nil {
 			newState.ReadyContinueTime = timestamppb.New(s.timeProvider().Add(s.gameConfig.PreparationTimeBeforeResume))
 		}

internal/app/statemachine/change_gameevent.go

@@ -118,10 +118,6 @@ func (s *StateMachine) processChangeAddGameEvent(newState *state.State, change *
 
 	// bot substitution
 	if *gameEvent.Type == state.GameEvent_BOT_SUBSTITUTION {
-		// reset robot substitution flags
-		for _, team := range state.BothTeams() {
-			newState.TeamInfo(team).RequestsBotSubstitutionSince = nil
-		}
 		// halt the game to allow teams to substitute robots
 		changes = append(changes, createCommandChange(state.NewCommandNeutral(state.Command_HALT)))
 	}