From b49be08ecc7f437f7b0e75a1e6e111f3ccff8d7b Mon Sep 17 00:00:00 2001 From: Kalle <38327916+Sendouc@users.noreply.github.com> Date: Tue, 10 Nov 2026 20:55:08 +0200 Subject: [PATCH] Make Tournament.teamById use seedsByStartingBracket instead of its own seed counting loop --- .../tournament-bracket/core/Tournament.ts | 32 +++++++------------ 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/app/features/tournament-bracket/core/Tournament.ts b/app/features/tournament-bracket/core/Tournament.ts index 06fae09b7..0f1e04819 100644 --- a/app/features/tournament-bracket/core/Tournament.ts +++ b/app/features/tournament-bracket/core/Tournament.ts @@ -10,6 +10,7 @@ import type { TournamentTierNumber } from "~/features/tournament/core/tiering"; import { TOURNAMENT } from "~/features/tournament/tournament-constants"; import { modesIncluded, + seedsByStartingBracket, sortTeamsBySeeding, tournamentInWeaponReportingWindow, tournamentIsRanked, @@ -130,6 +131,11 @@ export class Tournament { private _derivedMeta: BracketDerivedMeta[] | undefined; private _bracketsMeta: BracketMeta[] | undefined; private readonly bracketIdxsBeingBuilt = new Set(); + private readonly teamsById: Map< + number, + TournamentData["ctx"]["teams"][number] + >; + private readonly seedByTeamId: Map; constructor(args: TournamentArgs) { const { data, ctx, bracketsMeta, brackets } = args; @@ -164,6 +170,8 @@ export class Tournament { : teamsInSeedOrder, startsAt: databaseTimestampToDate(ctx.startsAt), }; + this.teamsById = new Map(this.ctx.teams.map((team) => [team.id, team])); + this.seedByTeamId = seedsByStartingBracket(this.ctx.teams); for (const bracket of brackets ?? []) { this._brackets[bracket.idx] = createBracket({ @@ -849,28 +857,10 @@ export class Tournament { } teamById(id: number) { - let result: (typeof this.ctx.teams)[number] | null = null; - let seed = 0; - let currStartingBracketIdx = this.ctx.teams.at(0)?.startingBracketIdx ?? 0; + const team = this.teamsById.get(id); + if (!team) return; - for (const team of this.ctx.teams) { - const teamStartingBracketIdx = team.startingBracketIdx ?? 0; - if (teamStartingBracketIdx !== currStartingBracketIdx) { - currStartingBracketIdx = teamStartingBracketIdx; - seed = 1; - } else { - seed++; - } - - if (team.id === id) { - result = team; - break; - } - } - - if (!result) return; - - return { ...result, seed }; + return { ...team, seed: this.seedByTeamId.get(id)! }; } /** User ids of the given team's members who played at least one map of the tournament. */