From 34333e306f85edaf4cb69d28fd85a190a8b0930e Mon Sep 17 00:00:00 2001
From: evan <openfrontio@gmail.com>
Date: Thu, 24 Apr 2025 08:14:06 -0700
Subject: [PATCH] bugfix: add null check on trade ship target in alternate view

---
 src/client/graphics/layers/UnitLayer.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/client/graphics/layers/UnitLayer.ts b/src/client/graphics/layers/UnitLayer.ts
index e3b59b92d..afbd8fe7f 100644
--- a/src/client/graphics/layers/UnitLayer.ts
+++ b/src/client/graphics/layers/UnitLayer.ts
@@ -429,7 +429,7 @@ export class UnitLayer implements Layer {
       if (unit.type() == UnitType.TradeShip && unit.dstPortId() != null) {
         const target = this.game.unit(unit.dstPortId())?.owner();
         const myPlayer = this.game.myPlayer();
-        if (myPlayer != null) {
+        if (myPlayer != null && target != null) {
           if (myPlayer == target) {
             rel = Relationship.Self;
           } else if (myPlayer.isFriendly(target)) {