[bugfix] Set next command to last command on defenderTooCloseToKickPoint

Author: g3force

internal/app/controller/engine.go

@@ -357,13 +357,29 @@ func (e *Engine) updateNextCommand() {
 	if primaryEvent == nil {
 		return
 	}
-	command, forTeam, err := e.CommandForEvent(primaryEvent)
-	if err != nil {
-		log.Print("Warn: ", err)
-		return
+	if primaryEvent.Type == GameEventDefenderTooCloseToKickPoint {
+		e.State.NextCommand, e.State.NextCommandFor =
+			e.lastCommand([]RefCommand{CommandIndirect, CommandDirect, CommandKickoff, CommandPenalty})
+	} else {
+		command, forTeam, err := e.CommandForEvent(primaryEvent)
+		if err != nil {
+			log.Print("Warn: ", err)
+			return
+		}
+		e.State.NextCommand = command
+		e.State.NextCommandFor = forTeam
+	}
+}
+
+func (e *Engine) lastCommand(commands []RefCommand) (RefCommand, Team) {
+	for i := len(e.History) - 1; i >= 0; i-- {
+		for _, cmd := range commands {
+			if e.History[i].State.Command == cmd {
+				return e.History[i].State.Command, e.History[i].State.CommandFor
+			}
+		}
 	}
-	e.State.NextCommand = command
-	e.State.NextCommandFor = forTeam
+	return CommandUnknown, TeamUnknown
 }
 
 func (e *Engine) processEvent(event Event) error {

internal/app/controller/gameEvent.go

@@ -236,8 +236,7 @@ func (e GameEvent) IsSecondary() bool {
 		GameEventPrepared,
 		GameEventBotSubstitution,
 		GameEventTooManyRobots,
-		GameEventBotInterferedPlacement,
-		GameEventDefenderTooCloseToKickPoint:
+		GameEventBotInterferedPlacement:
 		return true
 	}
 	return false

internal/app/controller/testdata/engine_test_gameevent_defenderTooCloseToKickPoint.yaml

@@ -0,0 +1,39 @@
+initialState:
+  stage: First Half
+  command: stop
+  division: DivA
+transitions:
+  - event:
+      command:
+        type: indirect
+        forTeam: Blue
+    expectedStateDiff:
+      command: indirect
+      commandFor: Blue
+      currentActionDeadline: "2010-01-01T00:00:05Z"
+      currentActionTimeRemaining: 5s
+  - event:
+      gameEvent:
+        type: defenderTooCloseToKickPoint
+        details:
+          defendertooclosetokickpoint:
+            byteam: 1 # Yellow
+            location:
+              x: 1.0
+              y: 2.0
+    expectedStateDiff:
+      command: stop
+      commandFor: ""
+      nextCommand: indirect
+      nextCommandFor: Blue
+      teamState:
+        Yellow:
+          foulCounter: 1
+      gameEvents:
+        - type: defenderTooCloseToKickPoint
+          details:
+            defendertooclosetokickpoint:
+              byteam: 1 # Yellow
+              location:
+                x: 1.0
+                y: 2.0