[bugfix] track recent game events separately

Author: g3force

internal/app/controller/autoRefConnection.go

@@ -26,7 +26,7 @@ func (c *GameController) ProcessAutoRefRequests(id string, request refproto.Auto
 	proposal := GameEventProposal{GameEvent: gameEvent, ProposerId: id, ValidUntil: validUntil}
 	proposal.GameEvent.Origins = []string{id}
 
-	recentGameEvent := c.Engine.State.IsRecentGameEvent(&gameEvent)
+	recentGameEvent := c.Engine.IsRecentGameEvent(&gameEvent)
 	if !recentGameEvent && c.Engine.applyMajority(&gameEvent) {
 		log.Printf("Apply majority logic to autoRef proposal %v", proposal)
 		if c.Engine.isNewProposal(&proposal) {

internal/app/controller/engine.go

@@ -68,15 +68,16 @@ func (s GameControllerState) DeepCopy() (c GameControllerState) {
 }
 
 type Engine struct {
-	State           *State
-	GcState         *GameControllerState
-	StageTimes      map[Stage]time.Duration
-	config          config.Game
-	TimeProvider    timer.TimeProvider
-	LastTimeUpdate  time.Time
-	PersistentState *PersistentState
-	Geometry        config.Geometry
-	Rand            *rand.Rand
+	State            *State
+	GcState          *GameControllerState
+	StageTimes       map[Stage]time.Duration
+	config           config.Game
+	TimeProvider     timer.TimeProvider
+	LastTimeUpdate   time.Time
+	PersistentState  *PersistentState
+	Geometry         config.Geometry
+	Rand             *rand.Rand
+	recentGameEvents []*GameEvent
 }
 
 func NewEngine(config config.Game, seed int64) (e Engine) {
@@ -90,6 +91,7 @@ func NewEngine(config config.Game, seed int64) (e Engine) {
 	e.TimeProvider = func() time.Time { return time.Now() }
 	e.LastTimeUpdate = e.TimeProvider()
 	e.Rand = rand.New(rand.NewSource(seed))
+	e.recentGameEvents = []*GameEvent{}
 	return
 }
 
@@ -274,6 +276,7 @@ func (e *Engine) setCurrentActionTimeout(timeout time.Duration) {
 func (e *Engine) AddGameEvent(gameEvent *GameEvent) {
 	e.LogGameEvent(gameEvent, e.State.DeepCopy())
 	e.State.GameEvents = append(e.State.GameEvents, gameEvent)
+	e.recentGameEvents = append(e.recentGameEvents, gameEvent)
 }
 
 func (e *Engine) QueueGameEvent(gameEvent *GameEvent) {
@@ -827,9 +830,17 @@ func (e *Engine) processGameEvent(event *GameEvent) error {
 
 	event.SetOccurred(e.TimeProvider())
 
+	// cleanup old recent events
+	for i, event := range e.recentGameEvents {
+		if event.occurred.Before(e.TimeProvider().Add(-time.Second * 2)) {
+			e.recentGameEvents = e.recentGameEvents[i+1:]
+			break
+		}
+	}
+
 	e.applyGameEventFilters(event)
 
-	if e.State.IsRecentGameEvent(event) {
+	if e.IsRecentGameEvent(event) {
 		// only add event to list, not to protocol
 		e.State.GameEvents = append(e.State.GameEvents, event)
 		return nil
@@ -1160,3 +1171,18 @@ func (e *Engine) removeElapsedYellowCards(team Team, teamState *TeamInfo) (remov
 	teamState.YellowCardTimes = b
 	return
 }
+
+func (e *Engine) FindMatchingRecentGameEvent(event *GameEvent) *GameEvent {
+	for _, gameEvent := range e.recentGameEvents {
+		if gameEvent.Type == event.Type &&
+			event.Occurred().Sub(gameEvent.Occurred()) < 3*time.Second {
+			return gameEvent
+		}
+	}
+	return nil
+}
+
+func (e *Engine) IsRecentGameEvent(event *GameEvent) bool {
+	matchingEvent := e.FindMatchingRecentGameEvent(event)
+	return matchingEvent != nil
+}

internal/app/controller/state.go

@@ -561,21 +561,6 @@ func (s *State) GetFirstGameEvent(gameEventType GameEventType) *GameEvent {
 	return nil
 }
 
-func (s *State) FindMatchingRecentGameEvent(event *GameEvent) *GameEvent {
-	for _, gameEvent := range s.GameEvents {
-		if gameEvent.Type == event.Type &&
-			event.Occurred().Sub(gameEvent.Occurred()) < 5*time.Second {
-			return gameEvent
-		}
-	}
-	return nil
-}
-
-func (s *State) IsRecentGameEvent(event *GameEvent) bool {
-	matchingEvent := s.FindMatchingRecentGameEvent(event)
-	return matchingEvent != nil
-}
-
 // Location is a two-dimensional coordinate
 type Location struct {
 	X float64 `json:"x" yaml:"x"`