From 3f8a3f3342f671c314b551dec235198ebc65f76d Mon Sep 17 00:00:00 2001
From: "Jamin W. Collins" <jamin.collins@gmail.com>
Date: Tue, 3 Apr 2018 20:12:15 -0600
Subject: [PATCH] use CardView for selection of exterting attackers

Signed-off-by: Jamin W. Collins <jamin.collins@gmail.com>
---
 .../main/java/forge/game/phase/PhaseHandler.java    |  1 -
 .../java/forge/player/PlayerControllerHuman.java    | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
index a3e13765a6b..0cea8d29b3b 100644
--- a/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
+++ b/forge-game/src/main/java/forge/game/phase/PhaseHandler.java
@@ -528,7 +528,6 @@ public class PhaseHandler implements java.io.Serializable {
 
             if (!possibleExerters.isEmpty()) {
                 for(Card exerter : whoDeclares.getController().exertAttackers(possibleExerters)) {
-                    //exerter.addExtrinsicKeyword("Exerted");
                     exerter.exert();
                 }
             }
diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
index d0a385110d2..47255337d33 100644
--- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
+++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
@@ -685,7 +685,18 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
 
     @Override
     public List<Card> exertAttackers(List<Card> attackers) {
-        return getGui().order("Exert Attackers?", "Exerted", 0, attackers.size(), attackers, null, null, false);
+        HashMap<CardView, Card> mapCVtoC = new HashMap<>();
+        for (Card card : attackers) {
+            mapCVtoC.put(card.getView(), card);
+        }
+        List<CardView> chosen;
+        List<CardView> choices = new ArrayList<CardView>(mapCVtoC.keySet());
+        chosen = getGui().order("Exert Attackers?", "Exerted", 0, choices.size(), choices, null, null, false);
+        List<Card> chosenCards = new ArrayList<Card>();
+        for (CardView cardView : chosen) {
+            chosenCards.add(mapCVtoC.get(cardView));
+        }
+        return chosenCards;
     }
 
     @Override