diff --git a/src/main/java/forge/card/ability/ai/ChangeZoneAi.java b/src/main/java/forge/card/ability/ai/ChangeZoneAi.java index cecbbb4bd2f..2d40ca462b5 100644 --- a/src/main/java/forge/card/ability/ai/ChangeZoneAi.java +++ b/src/main/java/forge/card/ability/ai/ChangeZoneAi.java @@ -8,7 +8,6 @@ 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; @@ -1345,9 +1344,8 @@ public class ChangeZoneAi extends SpellAbilityAi { if (((!ZoneType.Battlefield.equals(destination) && !"Card".equals(type) && !defined) || (sa.hasParam("Reveal") && !fetched.isEmpty())) && !sa.hasParam("NoReveal")) { - final String picked = player + " picked:"; - game.revealToPlayers(picked, fetched, destination, Lists.newArrayList(player)); + game.getAction().reveal(fetched, player); } } // end changeHiddenOriginResolveAI diff --git a/src/main/java/forge/game/Game.java b/src/main/java/forge/game/Game.java index 0fbd53775a6..efe7973f811 100644 --- a/src/main/java/forge/game/Game.java +++ b/src/main/java/forge/game/Game.java @@ -641,13 +641,4 @@ 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/GameAction.java b/src/main/java/forge/game/GameAction.java index 666cc094dff..600e77b3c0b 100644 --- a/src/main/java/forge/game/GameAction.java +++ b/src/main/java/forge/game/GameAction.java @@ -1408,16 +1408,15 @@ public class GameAction { return true; } // sacrificeDestroy() - /** - * TODO: Write javadoc for this method. - * @param targetCard - * @param activatingPlayer - */ public void reveal(List cards, Player cardOwner) { - ZoneType zt = cards.isEmpty() ? ZoneType.Hand : game.getZoneOf(cards.get(0)).getZoneType(); + ZoneType zt = cards.isEmpty() ? ZoneType.Hand : game.getZoneOf(cards.get(0)).getZoneType(); + reveal(cardOwner + " reveals card from " + zt, cards, zt, cardOwner, true); + } + + public void reveal(String message, List cards, ZoneType zt, Player cardOwner, boolean dontRevealToOwner) { for(Player p : game.getPlayers()) { - if (cardOwner == p /* && zt.isKnown() */) continue; - p.getController().reveal(cardOwner + " reveals card from " + zt, cards, zt, cardOwner); + if (dontRevealToOwner && cardOwner == p) continue; + p.getController().reveal(message, cards, zt, cardOwner); } } diff --git a/src/main/java/forge/game/GameActionUtil.java b/src/main/java/forge/game/GameActionUtil.java index 786d4f675a6..1ae33c77f90 100644 --- a/src/main/java/forge/game/GameActionUtil.java +++ b/src/main/java/forge/game/GameActionUtil.java @@ -117,7 +117,7 @@ public final class GameActionUtil { } // while - game.revealToPlayers("Revealed Cascade Cards:", revealed, ZoneType.Library, null); + game.getAction().reveal("Revealed Cascade Cards:", revealed, ZoneType.Library, controller, false); if (cascadedCard != null) { Player p = cascadedCard.getController();