diff --git a/forge-game/src/main/java/forge/game/cost/CostTapType.java b/forge-game/src/main/java/forge/game/cost/CostTapType.java index 207cadc38b6..f4f889f7c34 100644 --- a/forge-game/src/main/java/forge/game/cost/CostTapType.java +++ b/forge-game/src/main/java/forge/game/cost/CostTapType.java @@ -131,10 +131,8 @@ public class CostTapType extends CostPartWithList { } typeList = CardLists.filter(typeList, Presets.UNTAPPED); - boolean isCrew=false; if (ability.hasParam("Crew")) { typeList = CardLists.getNotKeyword(typeList, "CARDNAME can't crew Vehicles."); - isCrew=true; } if (sameType) { @@ -148,7 +146,7 @@ public class CostTapType extends CostPartWithList { if (totalPower) { final int i = Integer.parseInt(totalP); - return CardLists.getTotalPower(typeList, true, isCrew) >= i; + return CardLists.getTotalPower(typeList, true, ability.hasParam("Crew")) >= i; } final Integer amount = this.convertAmount(); diff --git a/forge-gui/src/main/java/forge/player/HumanCostDecision.java b/forge-gui/src/main/java/forge/player/HumanCostDecision.java index b5e4fb56a8c..1141e76244f 100644 --- a/forge-gui/src/main/java/forge/player/HumanCostDecision.java +++ b/forge-gui/src/main/java/forge/player/HumanCostDecision.java @@ -1187,10 +1187,8 @@ public class HumanCostDecision extends CostDecisionMakerBase { source, ability); typeList = CardLists.filter(typeList, Presets.UNTAPPED); - boolean isCrew=false; if (ability.hasParam("Crew")) { typeList = CardLists.getNotKeyword(typeList, "CARDNAME can't crew Vehicles."); - isCrew=true; } if (c == null && !amount.equals("Any")) { @@ -1249,7 +1247,7 @@ public class HumanCostDecision extends CostDecisionMakerBase { inp.setCancelAllowed(true); inp.showAndWait(); - if (inp.hasCancelled() || CardLists.getTotalPower(inp.getSelected(), true, isCrew) < i) { + if (inp.hasCancelled() || CardLists.getTotalPower(inp.getSelected(), true, ability.hasParam("Crew")) < i) { return null; } return PaymentDecision.card(inp.getSelected());