From b0175662ee798f4bc4055f9c6d717a36fec77d88 Mon Sep 17 00:00:00 2001 From: drdev Date: Mon, 6 Apr 2015 20:20:29 +0000 Subject: [PATCH] Avoid prompting user to select order abilities go on the stack if all abilities are the same --- .../src/main/java/forge/player/PlayerControllerHuman.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index e5c9e8b1616..299a08b24b0 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -1146,7 +1146,12 @@ public class PlayerControllerHuman public void orderAndPlaySimultaneousSa(List activePlayerSAs) { List orderedSAs = activePlayerSAs; if (activePlayerSAs.size() > 1) { // give a dual list form to create instead of needing to do it one at a time - orderedSAs = getGui().order("Select order for Simultaneous Spell Abilities", "Resolve first", activePlayerSAs, null); + String firstStr = orderedSAs.get(0).toString(); + for (int i = 1; i < orderedSAs.size(); i++) { //don't prompt user if all options are the same + if (!orderedSAs.get(i).toString().equals(firstStr)) { + orderedSAs = getGui().order("Select order for simultaneous abilities", "Resolve first", activePlayerSAs, null); + } + } } int size = orderedSAs.size(); for (int i = size - 1; i >= 0; i--) {