From 62a8983b48a2647b1d8cf7638b024ec528d0a4fd Mon Sep 17 00:00:00 2001
From: Alex Vasile <48962821+Alex-Vasile@users.noreply.github.com>
Date: Sat, 25 Jun 2022 11:17:06 -0400
Subject: [PATCH] [CLB] Fixed CommanderInPlayCondition, now only triggers for
 OWN commander. Closes #9125.

---
 .../common/CommanderInPlayCondition.java      |  2 +-
 .../common/ControlACommanderCondition.java    |  4 +-
 .../common/ControlYourCommanderCondition.java | 38 +++++++++++++++++++
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 Mage/src/main/java/mage/abilities/condition/common/ControlYourCommanderCondition.java

diff --git a/Mage/src/main/java/mage/abilities/condition/common/CommanderInPlayCondition.java b/Mage/src/main/java/mage/abilities/condition/common/CommanderInPlayCondition.java
index c414bf44f73..42f79a85e79 100644
--- a/Mage/src/main/java/mage/abilities/condition/common/CommanderInPlayCondition.java
+++ b/Mage/src/main/java/mage/abilities/condition/common/CommanderInPlayCondition.java
@@ -15,7 +15,7 @@ public enum CommanderInPlayCondition implements Condition {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        return ControlACommanderCondition.instance.apply(game, source);
+        return ControlYourCommanderCondition.instance.apply(game, source);
     }
 
     @Override
diff --git a/Mage/src/main/java/mage/abilities/condition/common/ControlACommanderCondition.java b/Mage/src/main/java/mage/abilities/condition/common/ControlACommanderCondition.java
index aee03164556..0b8c2855cbd 100644
--- a/Mage/src/main/java/mage/abilities/condition/common/ControlACommanderCondition.java
+++ b/Mage/src/main/java/mage/abilities/condition/common/ControlACommanderCondition.java
@@ -10,6 +10,8 @@ import java.util.Collection;
 import java.util.Objects;
 
 /**
+ * Checks if a player control ANY (not just their own) commander.
+ *
  * @author TheElk801
  */
 public enum ControlACommanderCondition implements Condition {
@@ -31,6 +33,6 @@ public enum ControlACommanderCondition implements Condition {
 
     @Override
     public String toString() {
-        return "If you control a commander";
+        return "If a control a commander";
     }
 }
diff --git a/Mage/src/main/java/mage/abilities/condition/common/ControlYourCommanderCondition.java b/Mage/src/main/java/mage/abilities/condition/common/ControlYourCommanderCondition.java
new file mode 100644
index 00000000000..a88c2a1e651
--- /dev/null
+++ b/Mage/src/main/java/mage/abilities/condition/common/ControlYourCommanderCondition.java
@@ -0,0 +1,38 @@
+package mage.abilities.condition.common;
+
+import mage.abilities.Ability;
+import mage.abilities.condition.Condition;
+import mage.constants.CommanderCardType;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+import java.util.Collection;
+import java.util.Objects;
+
+/**
+ * Checks if a player controls their commander.
+ *
+ * @author Alex-Vasile
+ */
+public enum ControlYourCommanderCondition implements Condition {
+    instance;
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        return game.getPlayerList()
+                .stream()
+                .map(game::getPlayer)
+                .filter(Objects::nonNull)
+                .map(player -> game.getCommandersIds(player, CommanderCardType.COMMANDER_OR_OATHBREAKER, true)) // must search all card parts (example: mdf commander on battlefield)
+                .flatMap(Collection::stream)
+                .map(game::getPermanent)
+                .filter(Objects::nonNull)
+                .map(Permanent::getOwnerId)
+                .anyMatch(source.getControllerId()::equals);
+    }
+
+    @Override
+    public String toString() {
+        return "If you control your commander";
+    }
+}