Fixed crash-inducing type

lexogrine · Jun 1, 2023 · 1e70067 · 1e70067
1 parent f3098ff
commit 1e70067
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/HUD/PlayerOverview/PlayerOverview.tsx b/src/HUD/PlayerOverview/PlayerOverview.tsx
@@ -20,7 +20,11 @@ export default class PlayerOverview extends React.Component<IProps> {
     getData = () => {
         const { veto, player, round } = this.props;
         if(!player || !veto || !veto.rounds) return null;
-        const stats = veto.rounds.map(round => round.players[player.steamid]).filter(data => !!data);
+        const stats = veto.rounds.map(round => round ? round.players[player.steamid] : {
+			kills: 0,
+			killshs: 0,
+			damage: 0
+		}).filter(data => !!data);
         const overall = {
             damage: this.sum(stats.map(round => round.damage)),
             kills: this.sum(stats.map(round => round.kills)),

diff --git a/src/HUD/Players/Observed.tsx b/src/HUD/Players/Observed.tsx
@@ -37,7 +37,12 @@ export default class Observed extends React.Component<{ player: Player | null, v
 	getAdr = () => {
 		const { veto, player } = this.props;
 		if (!player || !veto || !veto.rounds) return null;
-		const damageInRounds = veto.rounds.map(round => round.players[player.steamid]).filter(data => !!data).map(roundData => roundData.damage);
+		const damageInRounds = veto.rounds.map(round => round ? round.players[player.steamid] : {
+			kills: 0,
+			killshs: 0,
+			damage: 0
+		}).filter(data => !!data).map(roundData => roundData.damage);
+
 		return damageInRounds.reduce((a, b) => a + b, 0) / (this.props.round - 1);
 	}
 	render() {

diff --git a/src/api/interfaces.ts b/src/api/interfaces.ts
@@ -74,7 +74,7 @@ export interface Veto {
   side: "CT" | "T" | "NO";
   type: "ban" | "pick" | "decider";
   reverseSide?: boolean;
-  rounds?: RoundData[],
+  rounds?: (RoundData | null)[],
   score?: {
     [key: string]: number;
   };