Merge branch 'master' into lite

This commit is contained in:
Ken Schenke
2020-04-16 18:02:00 -05:00
2 changed files with 14 additions and 0 deletions

View File

@@ -206,6 +206,7 @@ func (arena *Arena) LoadMatch(match *model.Match) error {
arena.BlueScore = new(game.Score)
arena.FieldVolunteers = false
arena.FieldReset = false
arena.Plc.ResetMatch()
// Notify any listeners about the new match.
arena.MatchLoadNotifier.Notify()
@@ -396,6 +397,7 @@ func (arena *Arena) Update() {
enabled = true
sendDsPacket = true
}
arena.Plc.ResetMatch()
case WarmupPeriod:
auto = true
enabled = false