From 944fb62e87810f1e6828d153dea93090a09197bc Mon Sep 17 00:00:00 2001
From: evanpelle <openfrontio@gmail.com>
Date: Thu, 3 Jul 2025 18:35:56 -0700
Subject: [PATCH] unit upgrade fixes

---
 src/client/graphics/layers/BuildMenu.ts | 9 +++------
 src/core/game/PlayerImpl.ts             | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/client/graphics/layers/BuildMenu.ts b/src/client/graphics/layers/BuildMenu.ts
index b10901cd7..9a6fcc942 100644
--- a/src/client/graphics/layers/BuildMenu.ts
+++ b/src/client/graphics/layers/BuildMenu.ts
@@ -133,6 +133,9 @@ export class BuildMenu extends LitElement implements Layer {
 
   init() {
     this.eventBus.on(ShowBuildMenuEvent, (e) => {
+      if (!this.game.myPlayer()?.isAlive()) {
+        return;
+      }
       const clickedCell = this.transformHandler.screenToWorldCoordinates(
         e.x,
         e.y,
@@ -144,9 +147,6 @@ export class BuildMenu extends LitElement implements Layer {
         return;
       }
       const tile = this.game.ref(clickedCell.x, clickedCell.y);
-      if (!this.game.myPlayer()?.isAlive()) {
-        return;
-      }
       this.showMenu(tile);
     });
     this.eventBus.on(CloseViewEvent, () => this.hideMenu());
@@ -383,9 +383,6 @@ export class BuildMenu extends LitElement implements Layer {
   }
 
   public sendBuildOrUpgrade(buildableUnit: BuildableUnit, tile: TileRef): void {
-    if (buildableUnit === null) {
-      return;
-    }
     if (buildableUnit.canUpgrade !== false) {
       this.eventBus.emit(
         new SendUpgradeStructureIntentEvent(
diff --git a/src/core/game/PlayerImpl.ts b/src/core/game/PlayerImpl.ts
index e415a7aeb..8675f73b6 100644
--- a/src/core/game/PlayerImpl.ts
+++ b/src/core/game/PlayerImpl.ts
@@ -797,7 +797,7 @@ export class PlayerImpl implements Player {
   // Returns the existing unit that can be upgraded,
   // or false if it cannot be upgraded.
   // New units of the same type can upgrade existing units.
-  // e.g. if a place a new city here, will it upgrade an existing city?
+  // e.g. if a place a new city here, can it upgrade an existing city?
   private canUpgradeExistingUnit(
     type: UnitType,
     targetTile: TileRef,