From 8a33d9f781a7ec96d839d5eda45ba4c626b0f19d Mon Sep 17 00:00:00 2001 From: Virx Date: Tue, 27 May 2025 19:52:40 -0400 Subject: [PATCH] Set `Loadout` to `nil` for Psyonix/Human Run formatter --- app.go | 8 ++++---- players.go | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app.go b/app.go index ab6152f..7c7e3e6 100644 --- a/app.go +++ b/app.go @@ -199,7 +199,7 @@ func WaitForMatchReady( gamePacket = packet } case <-timer1.C: - conn.SendPacket(nil); + conn.SendPacket(nil) return fmt.Errorf("Timed out waiting for match start after %s", matchStartDur) } } @@ -224,7 +224,7 @@ func WaitForMatchReady( // Ignore other packet types in this phase } case <-timer2.C: - conn.SendPacket(nil); + conn.SendPacket(nil) return fmt.Errorf( "Timed out waiting for match ready after %s", matchReadyDur, @@ -378,8 +378,8 @@ func (a *App) PickRLBotToml() (string, error) { } filename := filepath.Base(path) - if filename == "bot.toml" || filename == "script.toml" || - strings.HasSuffix(filename, ".bot.toml") || + if filename == "bot.toml" || filename == "script.toml" || + strings.HasSuffix(filename, ".bot.toml") || strings.HasSuffix(filename, ".script.toml") { return path, nil } diff --git a/players.go b/players.go index 0898a44..a67cbf1 100644 --- a/players.go +++ b/players.go @@ -65,7 +65,7 @@ func (info PsyonixBotInfo) ToPlayerConfig(team uint32) *flat.PlayerConfiguration Team: team, RootDir: "", RunCommand: "", - Loadout: &flat.PlayerLoadoutT{}, + Loadout: nil, SpawnId: 0, Hivemind: false, } @@ -83,7 +83,7 @@ func (info HumanInfo) ToPlayerConfig(team uint32) *flat.PlayerConfigurationT { Team: team, RootDir: "", RunCommand: "", - Loadout: &flat.PlayerLoadoutT{}, + Loadout: nil, SpawnId: 0, Hivemind: false, }