From bd5654434aa9ed59923a02d951a9fbd0048683e0 Mon Sep 17 00:00:00 2001
From: variablevince <24507472+VariableVince@users.noreply.github.com>
Date: Mon, 27 Oct 2025 22:33:08 +0100
Subject: [PATCH] Fix merge issue

---
 src/core/game/PlayerImpl.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/game/PlayerImpl.ts b/src/core/game/PlayerImpl.ts
index bf25de30c..61b2f5918 100644
--- a/src/core/game/PlayerImpl.ts
+++ b/src/core/game/PlayerImpl.ts
@@ -906,6 +906,9 @@ export class PlayerImpl implements Player {
     if (unit.isMarkedForDeletion()) {
       return false;
     }
+    if (unit.owner() !== this) {
+      return false;
+    }
     if (!skipUnitTypeCheck && !this.canUpgradeUnitType(unit.type())) {
       return false;
     }
@@ -935,9 +938,6 @@ export class PlayerImpl implements Player {
     if (!this.isAlive()) {
       return false;
     }
-    if (unit.owner() !== this) {
-      return false;
-    }
     return true;
   }