diff --git a/forge-game/src/main/java/forge/game/Game.java b/forge-game/src/main/java/forge/game/Game.java index 8288ddeabc2..58d844b2911 100644 --- a/forge-game/src/main/java/forge/game/Game.java +++ b/forge-game/src/main/java/forge/game/Game.java @@ -636,7 +636,7 @@ public class Game { if (!visitor.visitAll(player.getZone(ZoneType.Library).getCards())) { return; } - if (!visitor.visitAll(player.getZone(ZoneType.Battlefield).getCards(false, true))) { + if (!visitor.visitAll(player.getZone(ZoneType.Battlefield).getCards(false))) { return; } if (!visitor.visitAll(player.getZone(ZoneType.Exile).getCards())) { diff --git a/forge-game/src/main/java/forge/game/ability/effects/SubgameEffect.java b/forge-game/src/main/java/forge/game/ability/effects/SubgameEffect.java index b1e6c4c16f9..bb2136d7780 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/SubgameEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/SubgameEffect.java @@ -100,7 +100,7 @@ public class SubgameEffect extends SpellAbilityEffect { final FCollectionView players = subgame.getPlayers(); final FCollectionView maingamePlayers = maingame.getPlayers(); final List outsideZones = Arrays.asList(ZoneType.Hand, ZoneType.Battlefield, - ZoneType.Graveyard, ZoneType.Exile, ZoneType.Stack, ZoneType.Sideboard, ZoneType.Ante); + ZoneType.Graveyard, ZoneType.Exile, ZoneType.Stack, ZoneType.Sideboard, ZoneType.Ante, ZoneType.Merged); for (int i = 0; i < players.size(); i++) { final Player player = players.get(i); diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 5c278280978..75d7c69e7e2 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -4283,7 +4283,7 @@ public class CardFactoryUtil { final StringBuilder sbMutate = new StringBuilder(); sbMutate.append("SP$ Mutate | Cost$ "); sbMutate.append(cost); - sbMutate.append(" | Mutate True | ValidTgts$ Creature.sharesOwnerWith+nonHuman"); + sbMutate.append(" | ValidTgts$ Creature.sharesOwnerWith+nonHuman"); final SpellAbility sa = AbilityFactory.getAbility(sbMutate.toString(), card); sa.setDescription("Mutate " + ManaCostParser.parse(cost) + diff --git a/forge-game/src/main/java/forge/game/player/Player.java b/forge-game/src/main/java/forge/game/player/Player.java index 1342b9cd72c..9604aa34805 100644 --- a/forge-game/src/main/java/forge/game/player/Player.java +++ b/forge-game/src/main/java/forge/game/player/Player.java @@ -1497,7 +1497,7 @@ public class Player extends GameEntity implements Comparable { } PlayerZone zone = getZone(zoneType); - return zone == null ? CardCollection.EMPTY : zone.getCards(filterOutPhasedOut, true); + return zone == null ? CardCollection.EMPTY : zone.getCards(filterOutPhasedOut); } public final CardCollectionView getCardsIncludePhasingIn(final ZoneType zone) { diff --git a/forge-game/src/main/java/forge/game/player/PlayerView.java b/forge-game/src/main/java/forge/game/player/PlayerView.java index 556fb7e4809..19e6e1cb6fd 100644 --- a/forge-game/src/main/java/forge/game/player/PlayerView.java +++ b/forge-game/src/main/java/forge/game/player/PlayerView.java @@ -470,7 +470,7 @@ public class PlayerView extends GameEntityView { void updateZone(PlayerZone zone) { TrackableProperty prop = getZoneProp(zone.getZoneType()); if (prop == null) { return; } - set(prop, CardView.getCollection(zone.getCards(false, true))); + set(prop, CardView.getCollection(zone.getCards(false))); //update delirium if (ZoneType.Graveyard == zone.getZoneType()) diff --git a/forge-game/src/main/java/forge/game/zone/PlayerZone.java b/forge-game/src/main/java/forge/game/zone/PlayerZone.java index b462fce45f2..0360bf22a1c 100644 --- a/forge-game/src/main/java/forge/game/zone/PlayerZone.java +++ b/forge-game/src/main/java/forge/game/zone/PlayerZone.java @@ -106,7 +106,7 @@ public class PlayerZone extends Zone { } public CardCollectionView getCardsPlayerCanActivate(Player who) { - CardCollectionView cl = getCards(false, true); + CardCollectionView cl = getCards(false); boolean checkingForOwner = who == player; if (checkingForOwner && (is(ZoneType.Battlefield) || is(ZoneType.Hand))) { diff --git a/forge-game/src/main/java/forge/game/zone/PlayerZoneBattlefield.java b/forge-game/src/main/java/forge/game/zone/PlayerZoneBattlefield.java index 99b8e277b77..8f6890555b5 100644 --- a/forge-game/src/main/java/forge/game/zone/PlayerZoneBattlefield.java +++ b/forge-game/src/main/java/forge/game/zone/PlayerZoneBattlefield.java @@ -6,12 +6,12 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ @@ -26,7 +26,7 @@ import forge.game.player.Player; *

* PlayerZoneComesIntoPlay class. *

- * + * * @author Forge * @version $Id$ @@ -84,20 +84,18 @@ public class PlayerZoneBattlefield extends PlayerZone { } @Override - public final CardCollectionView getCards(final boolean filterOutPhasedOut, final boolean filterOutMerged) { + public final CardCollectionView getCards(final boolean filter) { // Battlefield filters out Phased Out cards by default. Needs to call // getCards(false) to get Phased Out cards - // For merged permanent, also filter out all merged cards except the top one - CardCollectionView cards = super.getCards(false, false); - if (!filterOutPhasedOut && !filterOutMerged) { + CardCollectionView cards = super.getCards(false); + if (!filter) { return cards; } boolean hasFilteredCard = false; for (Card c : cards) { - if (filterOutPhasedOut && c.isPhasedOut() || - filterOutMerged && c.getMergedToCard() != null) { + if (c.isPhasedOut()) { hasFilteredCard = true; break; } @@ -106,8 +104,7 @@ public class PlayerZoneBattlefield extends PlayerZone { if (hasFilteredCard) { CardCollection filteredCollection = new CardCollection(); for (Card c : cards) { - if ((!filterOutPhasedOut || !c.isPhasedOut()) && - (!filterOutMerged || c.getMergedToCard() == null)) { + if (!c.isPhasedOut()) { filteredCollection.add(c); } } diff --git a/forge-game/src/main/java/forge/game/zone/Zone.java b/forge-game/src/main/java/forge/game/zone/Zone.java index e2632849705..950894eb990 100644 --- a/forge-game/src/main/java/forge/game/zone/Zone.java +++ b/forge-game/src/main/java/forge/game/zone/Zone.java @@ -190,10 +190,10 @@ public class Zone implements java.io.Serializable, Iterable { } public final CardCollectionView getCards() { - return getCards(true, true); + return getCards(true); } - public CardCollectionView getCards(final boolean filterOutPhasedOut, final boolean filterOutMerged) { + public CardCollectionView getCards(final boolean filter) { return cardList; // Non-Battlefield PlayerZones don't care about the filter }