From f45941307d9649919990a91a07a9bc1fa662a0bc Mon Sep 17 00:00:00 2001 From: Evan Date: Fri, 15 Nov 2024 20:44:09 -0800 Subject: [PATCH] resolve conflict --- src/client/graphics/layers/radial/BuildMenu.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/client/graphics/layers/radial/BuildMenu.ts b/src/client/graphics/layers/radial/BuildMenu.ts index e3b0f3600..4cb243426 100644 --- a/src/client/graphics/layers/radial/BuildMenu.ts +++ b/src/client/graphics/layers/radial/BuildMenu.ts @@ -9,6 +9,7 @@ import goldCoinIcon from '../../../../../resources/images/GoldCoinIcon.svg'; import portIcon from '../../../../../resources/images/PortIcon.svg'; import { renderNumber } from '../../Utils'; import { BuildValidator } from '../../../../core/game/BuildValidator'; +import { ContextMenuEvent } from '../../../InputHandler'; interface BuildItemDisplay { item: BuildItem @@ -147,7 +148,7 @@ export class BuildMenu extends LitElement { private _hidden = true; private canBuild(item: BuildItemDisplay): boolean { - if(this.myPlayer == null) { + if (this.myPlayer == null) { return false } return this.buildValidator.canBuild(this.myPlayer, this.game.tile(this.clickedCell), item.item)