diff --git a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java index 324aa16d6b2..32bd183ac3c 100644 --- a/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java +++ b/forge-ai/src/main/java/forge/ai/PlayerControllerAi.java @@ -829,12 +829,6 @@ public class PlayerControllerAi extends PlayerController { return SpellApiToAi.Converter.get(api).chooseBinary(kindOfChoice, sa, params); } - @Override - public Card chooseProtectionShield(GameEntity entityBeingDamaged, List options, Map choiceMap) { - int i = MyRandom.getRandom().nextInt(options.size()); - return choiceMap.get(options.get(i)); - } - @Override public List chooseModeForAbility(SpellAbility sa, List possible, int min, int num, boolean allowRepeat) { List result = brains.chooseModeForAbility(sa, possible, min, num, allowRepeat); diff --git a/forge-game/src/main/java/forge/game/player/PlayerController.java b/forge-game/src/main/java/forge/game/player/PlayerController.java index c531d96a979..85ab2eec1e9 100644 --- a/forge-game/src/main/java/forge/game/player/PlayerController.java +++ b/forge-game/src/main/java/forge/game/player/PlayerController.java @@ -214,14 +214,11 @@ public abstract class PlayerController { } public final boolean chooseBinary(SpellAbility sa, String question, BinaryChoiceType kindOfChoice) { return chooseBinary(sa, question, kindOfChoice, (Boolean) null); } - public abstract boolean chooseBinary(SpellAbility sa, String question, BinaryChoiceType kindOfChoice, Boolean defaultChioce); + public abstract boolean chooseBinary(SpellAbility sa, String question, BinaryChoiceType kindOfChoice, Boolean defaultChoice); public boolean chooseBinary(SpellAbility sa, String question, BinaryChoiceType kindOfChoice, Map params) { return chooseBinary(sa, question, kindOfChoice); } public abstract boolean chooseFlipResult(SpellAbility sa, Player flipper, boolean[] results, boolean call); - @Deprecated - public abstract Card chooseProtectionShield(GameEntity entityBeingDamaged, List options, Map choiceMap); - public abstract List chooseModeForAbility(SpellAbility sa, List possible, int min, int num, boolean allowRepeat); public abstract byte chooseColor(String message, SpellAbility sa, ColorSet colors); diff --git a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java index 8d1cdd595c8..ba20e68bac8 100644 --- a/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java +++ b/forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/PlayerControllerForTests.java @@ -450,11 +450,6 @@ public class PlayerControllerForTests extends PlayerController { return true; } - @Override - public Card chooseProtectionShield(GameEntity entityBeingDamaged, List options, Map choiceMap) { - return choiceMap.get(options.get(0)); - } - @Override public List chooseModeForAbility(SpellAbility sa, List possible, int min, int num, boolean allowRepeat) { throw new IllegalStateException("Erring on the side of caution here..."); diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index 84f8973f400..8b516972fd6 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -1677,13 +1677,6 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont return getGui().one(sa.getHostCard().getName() + " - " + localizer.getMessage("lblChooseAResult"), sortedResults).equals(labelsSrc[0]); } - @Override - public Card chooseProtectionShield(final GameEntity entityBeingDamaged, final List options, - final Map choiceMap) { - final String title = entityBeingDamaged + " - " + localizer.getMessage("lblSelectPreventionShieldToUse"); - return choiceMap.get(getGui().one(title, options)); - } - @Override public Pair chooseTarget(final SpellAbility saSpellskite, final List> allTargets) {