diff --git a/src/main/java/forge/card/ability/ai/ChangeZoneAi.java b/src/main/java/forge/card/ability/ai/ChangeZoneAi.java index 17f75b01fe1..cecbbb4bd2f 100644 --- a/src/main/java/forge/card/ability/ai/ChangeZoneAi.java +++ b/src/main/java/forge/card/ability/ai/ChangeZoneAi.java @@ -8,6 +8,7 @@ import java.util.Random; import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import forge.Card; import forge.CardCharacteristicName; @@ -1346,12 +1347,7 @@ public class ChangeZoneAi extends SpellAbilityAi { && !sa.hasParam("NoReveal")) { final String picked = player + " picked:"; - List otherPlayers = game.getPlayers(); - for (Player p : otherPlayers) { - if (!p.equals(player)) { - p.getController().reveal(picked, fetched, destination, player); - } - } + game.revealToPlayers(picked, fetched, destination, Lists.newArrayList(player)); } } // end changeHiddenOriginResolveAI diff --git a/src/main/java/forge/game/Game.java b/src/main/java/forge/game/Game.java index c8bcf28f64e..0fbd53775a6 100644 --- a/src/main/java/forge/game/Game.java +++ b/src/main/java/forge/game/Game.java @@ -19,6 +19,7 @@ package forge.game; import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Map; @@ -640,4 +641,13 @@ public class Game { public void setAge(GameAge value) { age = value; } + + public void revealToPlayers(String string, Collection cards, ZoneType zone, List skipReveal) { + List allPlayers = this.getPlayers(); + for (Player p : allPlayers) { + if (skipReveal != null && !skipReveal.contains(p)) { + p.getController().reveal(string, cards, zone, p); + } + } + } } diff --git a/src/main/java/forge/game/GameActionUtil.java b/src/main/java/forge/game/GameActionUtil.java index 219cadf2ede..786d4f675a6 100644 --- a/src/main/java/forge/game/GameActionUtil.java +++ b/src/main/java/forge/game/GameActionUtil.java @@ -116,7 +116,8 @@ public final class GameActionUtil { } } // while - GuiChoose.oneOrNone("Revealed cards:", revealed); + + game.revealToPlayers("Revealed Cascade Cards:", revealed, ZoneType.Library, null); if (cascadedCard != null) { Player p = cascadedCard.getController();