diff --git a/src/client/TerritoryPatternsModal.ts b/src/client/TerritoryPatternsModal.ts index e3dcec8ab..7a1f086ce 100644 --- a/src/client/TerritoryPatternsModal.ts +++ b/src/client/TerritoryPatternsModal.ts @@ -67,7 +67,7 @@ export class TerritoryPatternsModal extends LitElement { async onUserMe(userMeResponse: UserMeResponse | null) { if (userMeResponse === null) { - this.userSettings.setSelectedPatternName(undefined); + this.userSettings.setSelectedPattern(undefined); this.selectedPattern = undefined; } this.patterns = await patterns(userMeResponse); diff --git a/src/core/execution/alliance/AllianceRequestExecution.ts b/src/core/execution/alliance/AllianceRequestExecution.ts index b73cd50c6..9ae7cbdfb 100644 --- a/src/core/execution/alliance/AllianceRequestExecution.ts +++ b/src/core/execution/alliance/AllianceRequestExecution.ts @@ -9,7 +9,7 @@ import { export class AllianceRequestExecution implements Execution { private req: AllianceRequest | null = null; private active = true; - private mg: Game; + private mg: Game | undefined; constructor( private readonly requestor: Player, @@ -53,6 +53,7 @@ export class AllianceRequestExecution implements Execution { this.active = false; return; } + if (this.mg === undefined) throw new Error("Not initialized"); if ( this.mg.ticks() - (this.req?.createdAt() ?? 0) > this.mg.config().allianceRequestDuration() diff --git a/tests/AllianceRequestExecution.test.ts b/tests/AllianceRequestExecution.test.ts index c88edd5a0..b6df1e657 100644 --- a/tests/AllianceRequestExecution.test.ts +++ b/tests/AllianceRequestExecution.test.ts @@ -1,7 +1,7 @@ -import { AllianceRequestExecution } from "../src/core/execution/alliance/AllianceRequestExecution"; -import { AllianceRequestReplyExecution } from "../src/core/execution/alliance/AllianceRequestReplyExecution"; import { Game, Player, PlayerType } from "../src/core/game/Game"; import { playerInfo, setup } from "./util/Setup"; +import { AllianceRequestExecution } from "../src/core/execution/alliance/AllianceRequestExecution"; +import { AllianceRequestReplyExecution } from "../src/core/execution/alliance/AllianceRequestReplyExecution"; let game: Game; let player1: Player; @@ -64,13 +64,13 @@ describe("AllianceRequestExecution", () => { game.addExecution(new AllianceRequestExecution(player1, player2.id())); game.executeNextTick(); - expect(player1.outgoingAllianceRequests().length).toBe(1); + expect(player1.outgoingAllianceRequests()).toHaveLength(1); for (let i = 0; i < 6; i++) { game.executeNextTick(); } - expect(player1.outgoingAllianceRequests().length).toBe(0); + expect(player1.outgoingAllianceRequests()).toHaveLength(0); expect(player1.isAlliedWith(player2)).toBeFalsy(); expect(player2.isAlliedWith(player1)).toBeFalsy(); });