From 0f4811ed71ddcc79c3d173edb92a0082d73efbea Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Tue, 9 May 2017 05:56:04 +0000
Subject: [PATCH] - A couple fixes and improvements to Planar Conquest mode:
 the Commander card now goes into your main deck for non-EDH matches (e.g.
 Vanguard, standard Magic etc.); it's now possible to pay mana manually from
 the pool (was previously impossible due to the fact that the GUI player name
 was rigged in a hacky way, which caused the code to misbehave - thanks to
 nefigah for finding and debugging this).

---
 .../java/forge/planarconquest/ConquestController.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/forge-gui/src/main/java/forge/planarconquest/ConquestController.java b/forge-gui/src/main/java/forge/planarconquest/ConquestController.java
index f403b4b93a8..ab33b6b5a01 100644
--- a/forge-gui/src/main/java/forge/planarconquest/ConquestController.java
+++ b/forge-gui/src/main/java/forge/planarconquest/ConquestController.java
@@ -93,7 +93,9 @@ public class ConquestController {
             aiStart.setStartingLife(aiStart.getStartingLife() + 10);
             humanStart.assignCommander();
             aiStart.assignCommander();
-        }
+        } else { // Add commander as just a normal card in the deck
+            CardPool main = humanStart.getDeck().getOrCreate(DeckSection.Main);
+            main.add(humanStart.getDeck().getOrCreate(DeckSection.Commander).toFlatList());}
         if (variants.contains(GameType.Vanguard)) { //add opponent vanguard to player deck
             CardPool avatarPool = humanStart.getDeck().getOrCreate(DeckSection.Avatar);
             avatarPool.clear();
@@ -111,7 +113,9 @@ public class ConquestController {
             aiStart.setPlanes(planes);
         }
 
-        String humanPlayerName = commander.getPlayerName();
+        //String humanPlayerName = commander.getPlayerName(); // TODO: this currently makes it impossible to manually pay mana from pool (see VManaPool#tap)
+        String humanPlayerName = GamePlayerUtil.getGuiPlayer().getName();
+
         String aiPlayerName = battle.getOpponentName();
         if (humanPlayerName.equals(aiPlayerName)) {
             aiPlayerName += " (AI)"; //ensure player names are distinct