Fix nation immunity timing in singleplayer

Author: Aotumuri

src/core/game/GameImpl.ts

@@ -793,6 +793,17 @@ export class GameImpl implements Game {
   }
 
   public isNationSpawnImmunityActive(): boolean {
+    if (this.config().gameConfig().gameType === GameType.Singleplayer) {
+      this.updateSingleplayerStartTick();
+      if (this.inSpawnPhase()) {
+        return true;
+      }
+      const startTick = this.singleplayerStartTick ?? this.ticks();
+      return (
+        startTick + this.config().nationSpawnImmunityDuration() > this.ticks()
+      );
+    }
+
     return (
       this.config().numSpawnPhaseTurns() +
         this.config().nationSpawnImmunityDuration() >

src/core/game/GameView.ts

@@ -859,6 +859,17 @@ export class GameView implements GameMap {
     );
   }
   isNationSpawnImmunityActive(): boolean {
+    if (this._config.gameConfig().gameType === GameType.Singleplayer) {
+      this.updateSingleplayerStartTick();
+      if (this.inSpawnPhase()) {
+        return true;
+      }
+      const startTick = this.singleplayerStartTick ?? this.ticks();
+      return (
+        startTick + this._config.nationSpawnImmunityDuration() > this.ticks()
+      );
+    }
+
     return (
       this._config.numSpawnPhaseTurns() +
         this._config.nationSpawnImmunityDuration() >