diff --git a/forge-gui/src/main/java/forge/match/input/InputProliferate.java b/forge-gui/src/main/java/forge/match/input/InputProliferate.java index 60a331d1723..c2817cc02e8 100644 --- a/forge-gui/src/main/java/forge/match/input/InputProliferate.java +++ b/forge-gui/src/main/java/forge/match/input/InputProliferate.java @@ -17,10 +17,8 @@ public final class InputProliferate extends InputSelectManyBase { public InputProliferate() { super(1, Integer.MAX_VALUE); - allowUnselect = true; } - protected String getMessage() { StringBuilder sb = new StringBuilder("Choose permanents and/or players with counters on them to add one more counter of that type."); sb.append("\n\nYou've selected so far:\n"); diff --git a/forge-gui/src/main/java/forge/match/input/InputSelectCardsForConvoke.java b/forge-gui/src/main/java/forge/match/input/InputSelectCardsForConvoke.java index 913ff20b88e..0e6d1cc5edf 100644 --- a/forge-gui/src/main/java/forge/match/input/InputSelectCardsForConvoke.java +++ b/forge-gui/src/main/java/forge/match/input/InputSelectCardsForConvoke.java @@ -28,11 +28,9 @@ public final class InputSelectCardsForConvoke extends InputSelectManyBase super(0, Math.min(cost.getCMC(), untapped.size())); remainingCost = new ManaCostBeingPaid(cost); player = p; - allowUnselect = true; availableCreatures = untapped; } - protected String getMessage() { return "Choose creatures to tap for convoke.\nRemaining mana cost is " + remainingCost.toString(); } diff --git a/forge-gui/src/main/java/forge/match/input/InputSelectEntitiesFromList.java b/forge-gui/src/main/java/forge/match/input/InputSelectEntitiesFromList.java index 301bce05cc8..460b6c09a2f 100644 --- a/forge-gui/src/main/java/forge/match/input/InputSelectEntitiesFromList.java +++ b/forge-gui/src/main/java/forge/match/input/InputSelectEntitiesFromList.java @@ -53,8 +53,6 @@ public class InputSelectEntitiesFromList extends InputSele boolean entityWasSelected = selected.contains(c); if (entityWasSelected) { - if (!allowUnselect) - return false; this.selected.remove(c); } else { diff --git a/forge-gui/src/main/java/forge/match/input/InputSelectManyBase.java b/forge-gui/src/main/java/forge/match/input/InputSelectManyBase.java index 98642926717..21b3714d922 100644 --- a/forge-gui/src/main/java/forge/match/input/InputSelectManyBase.java +++ b/forge-gui/src/main/java/forge/match/input/InputSelectManyBase.java @@ -14,7 +14,6 @@ public abstract class InputSelectManyBase extends InputSyn protected boolean bCancelled = false; protected final int min; protected final int max; - protected boolean allowUnselect = false; protected boolean allowCancel = false; protected String message = "Source-Card-Name - Select %d more card(s)"; @@ -86,8 +85,5 @@ public abstract class InputSelectManyBase extends InputSyn } } - public final boolean isUnselectAllowed() { return allowUnselect; } - public final void setUnselectAllowed(boolean allow) { this.allowUnselect = allow; } - public final void setCancelAllowed(boolean allow) { this.allowCancel = allow ; } } diff --git a/forge-gui/src/main/java/forge/player/HumanCostDecision.java b/forge-gui/src/main/java/forge/player/HumanCostDecision.java index 919993ad4eb..349c2c6e5ec 100644 --- a/forge-gui/src/main/java/forge/player/HumanCostDecision.java +++ b/forge-gui/src/main/java/forge/player/HumanCostDecision.java @@ -824,7 +824,7 @@ public class HumanCostDecision extends CostDecisionMakerBase { } int tc = getTimesSelected(c); - cardsChosen.put(c, tc+1); + cardsChosen.put(c, tc + 1); onSelectStateChanged(c, true); refresh(); @@ -1074,7 +1074,6 @@ public class HumanCostDecision extends CostDecisionMakerBase { int i = Integer.parseInt(totalP); InputSelectCardsFromList inp = new InputSelectCardsFromList(0, typeList.size(), typeList); inp.setMessage("Select a card to tap."); - inp.setUnselectAllowed(true); inp.setCancelAllowed(true); inp.showAndWait();