diff --git a/src/core/game/GameView.ts b/src/core/game/GameView.ts index 63ce987de..c525129d1 100644 --- a/src/core/game/GameView.ts +++ b/src/core/game/GameView.ts @@ -212,7 +212,9 @@ export class PlayerView { .theme() .borderColor(defaultTerritoryColor); - const pattern = this.cosmetics.pattern; + const pattern = userSettings.territoryPatterns() + ? this.cosmetics.pattern + : undefined; if (pattern) { pattern.colorPalette ??= { name: "", @@ -224,7 +226,7 @@ export class PlayerView { if (this.team() === null) { this._territoryColor = colord( this.cosmetics.color?.color ?? - this.cosmetics.pattern?.colorPalette?.primaryColor ?? + pattern?.colorPalette?.primaryColor ?? defaultTerritoryColor.toHex(), ); } else { @@ -253,9 +255,9 @@ export class PlayerView { .defendedBorderColors(this._borderColor); this.decoder = - this.cosmetics.pattern === undefined + pattern === undefined ? undefined - : new PatternDecoder(this.cosmetics.pattern, base64url.decode); + : new PatternDecoder(pattern, base64url.decode); } territoryColor(tile?: TileRef): Colord {