From bec9af6d1e80076369c6112e712de7a34a8dec60 Mon Sep 17 00:00:00 2001
From: evanpelle <evanpelle@gmail.com>
Date: Wed, 17 Dec 2025 15:04:42 -0800
Subject: [PATCH] custom color bugfixes: don't add hash because it is already
 present in flare, clear current color on logout

---
 src/client/TerritoryPatternsModal.ts | 3 ++-
 src/server/Privilege.ts              | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/client/TerritoryPatternsModal.ts b/src/client/TerritoryPatternsModal.ts
index 39a28ff03..40a12d1fc 100644
--- a/src/client/TerritoryPatternsModal.ts
+++ b/src/client/TerritoryPatternsModal.ts
@@ -58,6 +58,7 @@ export class TerritoryPatternsModal extends LitElement {
   async onUserMe(userMeResponse: UserMeResponse | false) {
     if (!hasLinkedAccount(userMeResponse)) {
       this.userSettings.setSelectedPatternName(undefined);
+      this.userSettings.setSelectedColor(undefined);
       this.selectedPattern = null;
       this.selectedColor = null;
     }
@@ -186,7 +187,7 @@ export class TerritoryPatternsModal extends LitElement {
         : (this.userMeResponse.player.flares ?? [])
     )
       .filter((flare) => flare.startsWith("color:"))
-      .map((flare) => "#" + flare.split(":")[1]);
+      .map((flare) => flare.split(":")[1]);
     return html`
       <div class="flex flex-wrap gap-3 p-2 justify-center items-center">
         ${hexCodes.map(
diff --git a/src/server/Privilege.ts b/src/server/Privilege.ts
index fece2849e..62d917fd3 100644
--- a/src/server/Privilege.ts
+++ b/src/server/Privilege.ts
@@ -100,7 +100,7 @@ export class PrivilegeCheckerImpl implements PrivilegeChecker {
   isColorAllowed(flares: string[], color: string): PlayerColor {
     const allowedColors = flares
       .filter((flare) => flare.startsWith("color:"))
-      .map((flare) => "#" + flare.split(":")[1]);
+      .map((flare) => flare.split(":")[1]);
     if (!allowedColors.includes(color)) {
       throw new Error(`Color ${color} not allowed`);
     }