From 802cc7f16da73d9c48486f4899b9c227d191397f Mon Sep 17 00:00:00 2001 From: Ryan <7389646+ryanbarlow97@users.noreply.github.com> Date: Sun, 1 Mar 2026 12:11:00 +0000 Subject: [PATCH] Revert "Fix: Nations reject alliance requests during spawn phase" (#3313) ## Description: Reverts openfrontio/OpenFrontIO#3312 ## Please complete the following: - [x] I have added screenshots for all UI updates - [x] I process any text displayed to the user through translateText() and I've added it to the en.json file - [x] I have added relevant tests to the test directory - [x] I confirm I have thoroughly tested these changes and take full responsibility for any bugs introduced ## Please put your Discord username so you can be contacted if a bug or regression is found: w.o.n --- .../execution/nation/NationAllianceBehavior.ts | 5 ----- tests/NationAllianceBehavior.test.ts | 14 -------------- 2 files changed, 19 deletions(-) diff --git a/src/core/execution/nation/NationAllianceBehavior.ts b/src/core/execution/nation/NationAllianceBehavior.ts index 410e1a63e..186a3b556 100644 --- a/src/core/execution/nation/NationAllianceBehavior.ts +++ b/src/core/execution/nation/NationAllianceBehavior.ts @@ -76,11 +76,6 @@ export class NationAllianceBehavior { otherPlayer: Player, isResponse: boolean, ): boolean { - // Reject alliance requests during the spawn phase - if (this.game.inSpawnPhase()) { - return false; - } - // Easy (dumb) nations sometimes get confused and accept/reject randomly (Just like dumb humans do) if (this.isConfused()) { return this.random.chance(2); diff --git a/tests/NationAllianceBehavior.test.ts b/tests/NationAllianceBehavior.test.ts index 2849ac75b..ea2c74077 100644 --- a/tests/NationAllianceBehavior.test.ts +++ b/tests/NationAllianceBehavior.test.ts @@ -51,10 +51,6 @@ describe("AllianceBehavior.handleAllianceRequests", () => { player, new NationEmojiBehavior(random, game, player), ); - - while (game.inSpawnPhase()) { - game.executeNextTick(); - } }); function setupAllianceRequest({ @@ -96,16 +92,6 @@ describe("AllianceBehavior.handleAllianceRequests", () => { return mockRequest; } - test("should reject alliance during spawn phase", () => { - vi.spyOn(game, "inSpawnPhase").mockReturnValue(true); - const request = setupAllianceRequest({}); - - allianceBehavior.handleAllianceRequests(); - - expect(request.accept).not.toHaveBeenCalled(); - expect(request.reject).toHaveBeenCalled(); - }); - test("should accept alliance when all conditions are met", () => { const request = setupAllianceRequest({});