[bugfix] Fix undo function by doing deep copies of all states

Author: g3force

internal/app/controller/engine.go

@@ -85,12 +85,23 @@ func (e *Engine) AddGameEvent(gameEvent GameEvent) {
 func (e *Engine) UndoLastAction() {
 	lastIndex := len(e.History) - 2
 	if lastIndex >= 0 {
-		*e.State = e.History[lastIndex].State
-		e.RefereeEvents = e.History[lastIndex].RefereeEvents
+		*e.State = e.History[lastIndex].State.DeepCopy()
+		e.RefereeEvents = append(e.History[lastIndex].RefereeEvents[:0:0],
+			e.History[lastIndex].RefereeEvents...)
 		e.History = e.History[0:lastIndex]
 	}
 }
 
+func (e *Engine) appendHistory() {
+	var entry HistoryEntry
+	entry.State = e.State.DeepCopy()
+	entry.RefereeEvents = append(e.RefereeEvents[:0:0], e.RefereeEvents...)
+	e.History = append(e.History, entry)
+	if len(e.History) > maxHistorySize {
+		e.History = e.History[1:]
+	}
+}
+
 func (e *Engine) Continue() {
 	substitutionIntend := e.State.BotSubstitutionIntend()
 	if substitutionIntend != TeamUnknown {
@@ -230,13 +241,6 @@ func (e *Engine) updateMaxBots() {
 	}
 }
 
-func (e *Engine) appendHistory() {
-	e.History = append(e.History, HistoryEntry{*e.State, e.RefereeEvents})
-	if len(e.History) > maxHistorySize {
-		e.History = e.History[1:]
-	}
-}
-
 func (e *Engine) LogGameEvent(event GameEvent) {
 	gameEvent := RefereeEvent{
 		Timestamp:   e.TimeProvider().UnixNano(),

internal/app/controller/state.go

@@ -252,6 +252,12 @@ type TeamInfo struct {
 	BotSubstitutionIntend bool            `json:"botSubstitutionIntend"`
 }
 
+func (t TeamInfo) DeepCopy() (c TeamInfo) {
+	c = t
+	copy(c.YellowCardTimes, t.YellowCardTimes)
+	return
+}
+
 type GameEventBehavior string
 
 const (
@@ -318,6 +324,30 @@ func NewState() (s *State) {
 	return
 }
 
+func (s State) DeepCopy() (c State) {
+	c = s
+	c.GameEvents = []*GameEvent{}
+	copy(c.GameEvents, s.GameEvents)
+	c.AutoRefsConnected = []string{}
+	copy(c.AutoRefsConnected, s.AutoRefsConnected)
+	c.GameEventProposals = []*GameEventProposal{}
+	copy(c.GameEventProposals, s.GameEventProposals)
+	if s.PlacementPos != nil {
+		c.PlacementPos = new(Location)
+		*c.PlacementPos = *s.PlacementPos
+	}
+	c.TeamState = make(map[Team]*TeamInfo)
+	for k, v := range s.TeamState {
+		c.TeamState[k] = new(TeamInfo)
+		*c.TeamState[k] = v.DeepCopy()
+	}
+	c.GameEventBehavior = make(map[GameEventType]GameEventBehavior)
+	for k, v := range s.GameEventBehavior {
+		c.GameEventBehavior[k] = v
+	}
+	return
+}
+
 func (s State) GameState() GameState {
 	switch s.Command {
 	case CommandHalt: