From d1ca65eb157aa459b6de653fedf906d926def6f7 Mon Sep 17 00:00:00 2001
From: Aotumuri <aotumuri.yt@gmail.com>
Date: Sat, 17 May 2025 17:47:36 +0900
Subject: [PATCH] fixed

---
 src/client/Main.ts        | 12 ++++++------
 src/core/game/Game.ts     |  2 +-
 src/core/game/GameView.ts |  2 +-
 tests/util/Setup.ts       |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/client/Main.ts b/src/client/Main.ts
index 45f19b94f..9f68e8f71 100644
--- a/src/client/Main.ts
+++ b/src/client/Main.ts
@@ -162,12 +162,12 @@ class Client {
     const TerritoryModal = document.querySelector(
       "territory-patterns-input",
     ) as territoryPatternsModal;
+    const tpButton = document.getElementById("territory-patterns-input_");
     TerritoryModal instanceof territoryPatternsModal;
-    document
-      .getElementById("territory-patterns-input_")
-      .addEventListener("click", () => {
-        TerritoryModal.open();
-      });
+    if (tpButton === null) throw new Error("Missing territory-patterns-input_");
+    tpButton.addEventListener("click", () => {
+      TerritoryModal.open();
+    });
 
     const claims = isLoggedIn();
     if (claims === false) {
@@ -288,7 +288,7 @@ class Client {
       {
         gameID: lobby.gameID,
         serverConfig: config,
-        pattern: localStorage.getItem("territoryPattern"),
+        pattern: localStorage.getItem("territoryPattern") ?? "",
         flag:
           this.flagInput === null || this.flagInput.getCurrentFlag() === "xx"
             ? ""
diff --git a/src/core/game/Game.ts b/src/core/game/Game.ts
index 847b8f35e..ecda9d643 100644
--- a/src/core/game/Game.ts
+++ b/src/core/game/Game.ts
@@ -302,7 +302,7 @@ export class PlayerInfo {
   public readonly clan: string | null;
 
   constructor(
-    public readonly pattern: string | undefined,
+    public readonly pattern: string | null | undefined,
     public readonly flag: string | undefined,
     public readonly name: string,
     public readonly playerType: PlayerType,
diff --git a/src/core/game/GameView.ts b/src/core/game/GameView.ts
index c2d92f65b..fa9f033f5 100644
--- a/src/core/game/GameView.ts
+++ b/src/core/game/GameView.ts
@@ -174,7 +174,7 @@ export class PlayerView {
     return this.data.flag;
   }
 
-  pattern(): string {
+  pattern(): string | undefined | null {
     return this.data.pattern;
   }
 
diff --git a/tests/util/Setup.ts b/tests/util/Setup.ts
index 8fc694e2e..66c2fc288 100644
--- a/tests/util/Setup.ts
+++ b/tests/util/Setup.ts
@@ -57,5 +57,5 @@ export async function setup(
 }
 
 export function playerInfo(name: string, type: PlayerType): PlayerInfo {
-  return new PlayerInfo("fr", name, type, null, name);
+  return new PlayerInfo(null, "fr", name, type, null, name);
 }